From fcb2226b976880e80f8bc4fdbd09d06d2a9e8d72 Mon Sep 17 00:00:00 2001 From: B Stack Date: Tue, 2 Feb 2021 13:33:22 -0500 Subject: ffs 11.6 rc1 --- freefilesync/debian/patches/ffs_traditional_view.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'freefilesync/debian/patches/ffs_traditional_view.patch') diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index e5c4a14..e7e0952 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -1,5 +1,5 @@ -Version: 11.5 -Date: 2021-01-04 +Version: 11.6 +Date: 2021-02-02 Author: bgstack15@gmail.com Message: restore a traditional view to FreeFileSync diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.3-1/FreeFileSync/Source/ui/file_grid.cpp @@ -189,11 +189,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11. - if (!groupParentFolder.empty() && + if (itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel || (!groupParentFolder.empty() && (( stackedGroupRender && row == groupFirstRow + 1) || -- (!stackedGroupRender && row == groupFirstRow)) -+ (!stackedGroupRender && row == groupFirstRow))) - //&& (groupName.empty() || !pdi.folderGroupObj->isEmpty()) -> show unconditionally, even for missing folders - ) +- (!stackedGroupRender && row == groupFirstRow)) && ++ (!stackedGroupRender && row == groupFirstRow))) && + (groupName.empty() || !pdi.folderGroupObj->isEmpty())) //don't show for missing folders { + wxRect rectGroupParentText = rectGroupParent; @@ -994,16 +1062,16 @@ rectGroupItems.x += 2 * gapSize_; rectGroupItems.width -= 2 * gapSize_; -- cgit