diff options
author | B Stack <bgstack15@gmail.com> | 2021-02-02 23:59:22 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2021-02-02 23:59:22 +0000 |
commit | 020db28c7559db43c26cba54c1b0f47c675ec906 (patch) | |
tree | 38d238404dded6a8855a3731564aeda60df033cf /freefilesync/debian/patches/ffs_traditional_view.patch | |
parent | Merge branch 'waterfox-bump' into 'master' (diff) | |
parent | fix icon source to zip file (diff) | |
download | stackrpms-020db28c7559db43c26cba54c1b0f47c675ec906.tar.gz stackrpms-020db28c7559db43c26cba54c1b0f47c675ec906.tar.bz2 stackrpms-020db28c7559db43c26cba54c1b0f47c675ec906.zip |
Merge branch 'freefilesync-bump' into 'master'
Freefilesync 11.6
See merge request bgstack15/stackrpms!215
Diffstat (limited to 'freefilesync/debian/patches/ffs_traditional_view.patch')
-rw-r--r-- | freefilesync/debian/patches/ffs_traditional_view.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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<side>()) -> show unconditionally, even for missing folders - ) +- (!stackedGroupRender && row == groupFirstRow)) && ++ (!stackedGroupRender && row == groupFirstRow))) && + (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())) //don't show for missing folders { + wxRect rectGroupParentText = rectGroupParent; @@ -994,16 +1062,16 @@ rectGroupItems.x += 2 * gapSize_; rectGroupItems.width -= 2 * gapSize_; |