diff options
| author | B Stack <bgstack15@gmail.com> | 2021-01-05 12:44:40 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2021-01-05 12:44:40 +0000 |
| commit | 187564b4e07f856cc16bf649ebcd781f6d7573fc (patch) | |
| tree | 595d578b18ca05f1da2fe167ba1e8ef5796ebb3e /freefilesync/debian/patches | |
| parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
| parent | ffs 11.5-1 rc1 (diff) | |
| download | stackrpms-187564b4e07f856cc16bf649ebcd781f6d7573fc.tar.gz stackrpms-187564b4e07f856cc16bf649ebcd781f6d7573fc.tar.bz2 stackrpms-187564b4e07f856cc16bf649ebcd781f6d7573fc.zip | |
Merge branch 'freefilesync-bump' into 'master'
ffs 11.5-1
See merge request bgstack15/stackrpms!211
Diffstat (limited to 'freefilesync/debian/patches')
| -rw-r--r-- | freefilesync/debian/patches/ffs_traditional_view.patch | 8 | ||||
| -rw-r--r-- | freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/freefilesync/debian/patches/ffs_traditional_view.patch b/freefilesync/debian/patches/ffs_traditional_view.patch index c075820..e5c4a14 100644 --- a/freefilesync/debian/patches/ffs_traditional_view.patch +++ b/freefilesync/debian/patches/ffs_traditional_view.patch @@ -1,5 +1,5 @@ -Version: 11.4 -Date: 2020-12-08 +Version: 11.5 +Date: 2021-01-04 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 @@ -158,7 +158,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11. clearArea(dc, rectGroupBack, getDefaultBackgroundColorAlternating(pdi.groupIdx % 2 == 0)); //clearArea() is surprisingly expensive => call just once! -@@ -922,7 +989,8 @@ +@@ -924,7 +991,8 @@ rectNav.width = fastFromDIP(20); if (row == pdi.groupLastRow - 1 /*last group item*/) //preserve the group separation line! @@ -166,7 +166,7 @@ diff -x '*.orig' -x '*.rej' -aur 11.3-0/FreeFileSync/Source/ui/file_grid.cpp 11. + if (itemPathFormat_ != ItemPathFormat::traditional && itemPathFormat_ != ItemPathFormat::tradrel) + rectNav.height -= lineWidth; - wxColor backCol = *wxWHITE; + wxColor backCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); dc.GetPixel(rectNav.GetTopRight(), &backCol); //e.g. selected row! @@ -930,11 +998,11 @@ dc.GradientFillLinear(rectNav, getColorSelectionGradientFrom(), backCol, wxEAST); diff --git a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index ad3f51e..9492e33 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -156,11 +156,11 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu { SetLabel(label); diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/dc.h 11.1-2/wx+/dc.h ---- 11.1-1/wx+/dc.h 2020-09-01 19:09:33.652448178 -0400 -+++ 11.1-2/wx+/dc.h 2020-09-01 20:08:43.183988180 -0400 +--- 11.5-0/wx+/dc.h 2021-01-04 08:07:48.384544469 -0500 ++++ 11.5-1/wx+/dc.h 2021-01-04 08:13:41.316314485 -0500 @@ -68,9 +68,6 @@ inline - int fastFromDIP(int d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) + int fastFromDIP(double d) //like wxWindow::FromDIP (but tied to primary monitor and buffered) { -#ifndef wxHAVE_DPI_INDEPENDENT_PIXELS -#error why is wxHAVE_DPI_INDEPENDENT_PIXELS not defined? |