ffs 11.12

1 files changed, 11 insertions, 9 deletions

diff --git a/freefilesync/ffs_traditional_view.patch b/freefilesync/ffs_traditional_view.patch
index 616d665..c48536f 100644
--- a/freefilesync/ffs_traditional_view.patch
+++ b/freefilesync/ffs_traditional_view.patch
@@ -168,7 +168,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
  
                                  wxColor backCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
                                  dc.GetPixel(rectNav.GetTopRight(), &backCol); //e.g. selected row!
-@@ -930,11 +998,11 @@
+@@ -914,13 +982,13 @@
                                  dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), backCol, wxEAST);
                              }
  
@@ -176,12 +176,14 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 +                        if (!(itemPathFormat_ == ItemPathFormat::traditional || itemPathFormat_ == ItemPathFormat::tradrel) && !groupName.empty() && row == groupFirstRow)
                          {
                              wxRect rectGroupNameBack = rectGroupName;
-                             rectGroupNameBack.width += 2 * gapSize_; //include gap left of vline
+ 
+                             if (!itemName.empty()) 
+                                 rectGroupNameBack.width += 2 * gapSize_; //include gap left of item vline
 -                            rectGroupNameBack.height -= fastFromDIP(1); //harmonize with item separation lines
 +                            rectGroupNameBack.height -= lineWidth; //harmonize with item separation lines
  
-                             //mouse highlight: group name
                              wxDCTextColourChanger textColorGroupName(dc);
+                             //folder background: coordinate with renderRowBackgound()
 @@ -974,9 +1042,9 @@
                                  drawCellText(dc, rectGroupName, groupName, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, &getTextExtentBuffered(dc, groupName));
                          }
@@ -194,7 +196,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
                              (groupName.empty() || !pdi.folderGroupObj->isEmpty<side>())) //don't show for missing folders
                          {
                              wxRect rectGroupParentText = rectGroupParent;
-@@ -994,16 +1062,16 @@
+@@ -975,16 +1043,16 @@
                              rectGroupItems.x     += 2 * gapSize_;
                              rectGroupItems.width -= 2 * gapSize_;
  
@@ -213,8 +215,8 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11.
 -                        rectItemsBack.height -= fastFromDIP(1); //preserve item separation lines!
 +                        rectItemsBack.height -= lineWidth; //preserve item separation lines!
  
-                         //mouse highlight: item name
-                         wxDCTextColourChanger textColorGroupItems(dc);
+                             drawCudHighlight(rectItemsBack, pdi.fsObj->getSyncOperation());
+ 
 @@ -1134,7 +1202,12 @@
                               groupNameWidth] = getGroupRenderLayout(dc, row, pdi, insanelyHugeWidth);
                  assert(!stackedGroupRender);
@@ -274,8 +276,8 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/file_g
  const ItemPathFormat defaultItemPathFormatLeftGrid  = ItemPathFormat::relative;
 diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp
 --- 11.2-1/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 20:49:11.487782099 -0400
-+++ 11.2-1-trad3/FreeFileSync/Source/ui/main_dlg.cpp	2020-10-02 20:22:02.191278722 -0400
-@@ -2710,6 +2710,8 @@
++++ 11.12-1/FreeFileSync/Source/ui/main_dlg.cpp	2021-07-15 20:22:02.191278722 -0400
+@@ -2653,6 +2647,8 @@
      addFormatEntry(_("Item name"    ), ItemPathFormat::name);
      addFormatEntry(_("Relative path"), ItemPathFormat::relative);
      addFormatEntry(_("Full path"    ), ItemPathFormat::full);
@@ -283,7 +285,7 @@ diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/ui/main_d
 +    addFormatEntry(_("Trad. relative"),ItemPathFormat::tradrel);
  
      //----------------------------------------------------------------------------------------------
-     menu.addSeparator();
+     auto setIconSize = [&](FileIconSize sz, bool showIcons)
 diff -x '.git*' -x '*.orig' -x '*.rej' -aur 11.2-1/FreeFileSync/Source/config.cpp 11.2-1-trad3/FreeFileSync/Source/config.cpp
 --- 11.2-1/FreeFileSync/Source/config.cpp	2020-10-02 14:39:05.233462578 -0400
 +++ 11.2-1-trad3/FreeFileSync/Source/config.cpp	2020-10-02 20:22:24.275555557 -0400