summaryrefslogtreecommitdiff
path: root/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch
diff options
context:
space:
mode:
Diffstat (limited to 'freefilesync/04_revert_zenju_aggressive_upstreamisms.patch')
-rw-r--r--freefilesync/04_revert_zenju_aggressive_upstreamisms.patch69
1 files changed, 61 insertions, 8 deletions
diff --git a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch
index 43fec48..4758004 100644
--- a/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch
+++ b/freefilesync/04_revert_zenju_aggressive_upstreamisms.patch
@@ -1,6 +1,6 @@
Message: Some of these can be traced back to version 10.23 which was the last to not use <unordered_map>
-Date: 2022-05-22
-Version: 11.21
+Date: 2022-06-26
+Version: 11.22
Author: bgstack15
diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h
--- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400
@@ -143,9 +143,9 @@ diff -x '*.orig' -x '*.rej' -aur 11.2-0/FreeFileSync/Source/ui/folder_selector.c
//It looks like wxDD_SHOW_HIDDEN only sets the default when opening for the first time!?
if (folderSelector.ShowModal() != wxID_OK)
diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_button.h
---- 11.1-1/wx+/bitmap_button.h 2020-09-01 19:07:43.727122311 -0400
-+++ 11.1-2/wx+/bitmap_button.h 2020-09-01 20:10:31.385364671 -0400
-@@ -26,7 +26,7 @@
+--- 11.22-0/wx+/bitmap_button.h 2022-06-26 12:01:15.638291465 -0400
++++ 11.22-1/wx+/bitmap_button.h 2022-06-26 12:51:34.527830821 -0400
+@@ -28,7 +28,7 @@
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
@@ -154,6 +154,22 @@ diff -x '*.orig' -x '*.rej' -aur 11.1-1/wx+/bitmap_button.h 11.1-2/wx+/bitmap_bu
wxBitmapButton(parent, id, wxNullBitmap, pos, size, style, validator, name)
{
SetLabel(label);
+@@ -104,7 +104,6 @@
+ wxBitmap renderSelectedButton(const wxSize& sz)
+ {
+ wxBitmap bmp(sz); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+- bmp.SetScaleFactor(getDisplayScaleFactor());
+ {
+ wxMemoryDC dc(bmp);
+
+@@ -120,7 +119,6 @@
+ wxBitmap renderPressedButton(const wxSize& sz)
+ {
+ wxBitmap bmp(sz); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+- bmp.SetScaleFactor(getDisplayScaleFactor());
+ {
+ //draw rectangle border with gradient
+ const wxColor colFrom = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/wx+/dc.h
--- 11.21-0/wx+/dc.h 2022-05-22 17:09:32.250809701 -0400
+++ 11.21-1/wx+/dc.h 2022-05-22 20:28:53.788193992 -0400
@@ -176,7 +192,7 @@ diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/
//GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114
//=> requires general fix at wxWidgets-level
-@@ -119,11 +116,10 @@
+@@ -126,11 +123,10 @@
inline
@@ -185,7 +201,7 @@ diff -aur -x '*.git*' -x '.*.swp' -x '*.orig' -x '*.rej' 11.6-0/wx+/dc.h 11.6-1/
{
//return wxBitmap(img, -1 /*depth*/, static_cast<double>(getDPI()) / defaultDpi); implementation just ignores scale parameter! WTF!
wxBitmap bmpScaled(img);
-- bmpScaled.SetScaleFactor(static_cast<double>(getDPI()) / defaultDpi);
+- bmpScaled.SetScaleFactor(getDisplayScaleFactor());
return bmpScaled;
}
@@ -328,7 +344,12 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+
richCtrl.SetMargins({0, 0});
--- 11.20-0/FreeFileSync/Source/ui/progress_indicator.cpp 2022-04-18 09:49:31.917386558 -0400
+++ 11.20-1/FreeFileSync/Source/ui/progress_indicator.cpp 2022-04-18 11:02:10.988781908 -0400
-@@ -882,7 +885,6 @@
+@@ -878,12 +881,10 @@
+ auto generateSquareBitmap = [&](const wxColor& fillCol, const wxColor& borderCol)
+ {
+ wxBitmap bmpSquare(this->GetCharHeight(), this->GetCharHeight()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+- bmpSquare.SetScaleFactor(getDisplayScaleFactor());
+ {
wxMemoryDC dc(bmpSquare);
drawInsetRectangle(dc, wxRect(bmpSquare.GetSize()), fastFromDIP(1), borderCol, fillCol);
}
@@ -336,3 +357,35 @@ diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+
return bmpSquare;
};
pnl_.m_bitmapGraphKeyBytes->SetBitmap(generateSquareBitmap(getColorBytes(), getColorBytesRim()));
+--- 11.22-0/wx+/rtl.h 2022-06-26 12:01:15.642291514 -0400
++++ 11.22-1/wx+/rtl.h 2022-06-26 12:58:17.248838575 -0400
+@@ -69,9 +69,6 @@
+ if (!buffer || buffer->GetSize() != rect.GetSize()) //[!] since we do a mirror, width needs to match exactly!
+ buffer.emplace(rect.GetSize());
+
+- if (buffer->GetScaleFactor() != dc.GetContentScaleFactor()) //needed here?
+- buffer->SetScaleFactor(dc.GetContentScaleFactor()); //
+-
+ wxMemoryDC memDc(*buffer); //copies scale factor from wxBitmap
+ memDc.Blit(wxPoint(0, 0), rect.GetSize(), &dc, rect.GetTopLeft()); //blit in: background is mirrored due to memDc, dc having different layout direction!
+
+--- 11.22-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 12:01:15.634291415 -0400
++++ 11.22-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-06-26 14:44:38.556188935 -0400
+@@ -3595,7 +3590,6 @@
+ };
+
+ wxBitmap bmpSquare(this->GetCharHeight(), this->GetCharHeight()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+- bmpSquare.SetScaleFactor(getDisplayScaleFactor());
+ {
+ wxMemoryDC dc(bmpSquare);
+ const wxColor borderCol(0xdd, 0xdd, 0xdd); //light grey
+--- 11.22-0/wx+/image_tools.cpp 2022-06-26 16:29:25.668035003 -0400
++++ 11.22-1/wx+/image_tools.cpp 2022-06-27 09:06:04.999244263 -0400
+@@ -188,7 +188,6 @@
+ return wxNullImage;
+
+ wxBitmap newBitmap(maxWidth, lineHeight * lineInfo.size()); //seems we don't need to pass 24-bit depth here even for high-contrast color schemes
+- newBitmap.SetScaleFactor(getDisplayScaleFactor());
+ {
+ dc.SelectObject(newBitmap); //copies scale factor from wxBitmap
+ ZEN_ON_SCOPE_EXIT(dc.SelectObject(wxNullBitmap));
bgstack15