diff options
author | B Stack <bgstack15@gmail.com> | 2020-12-10 12:28:18 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-12-10 12:28:18 +0000 |
commit | 95d1c5485ea21247f0311ea646e17965170766e8 (patch) | |
tree | a5ad6d0ca55c3915d2ae29e65c6b1cffbf9d57fd /freefilesync/revert_zenju_aggressive_upstreamisms.patch | |
parent | Merge branch 'palemoon-bump' into 'master' (diff) | |
parent | ffs rpm 11.4 (diff) | |
download | stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.tar.gz stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.tar.bz2 stackrpms-95d1c5485ea21247f0311ea646e17965170766e8.zip |
Merge branch 'freefilesync-bump' into 'master'
FreeFileSync 11.4
See merge request bgstack15/stackrpms!206
Diffstat (limited to 'freefilesync/revert_zenju_aggressive_upstreamisms.patch')
-rw-r--r-- | freefilesync/revert_zenju_aggressive_upstreamisms.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index 1a468db..ad3f51e 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch @@ -293,3 +293,15 @@ index e8ed01e4..2a9e00d2 100644 void showStatsPanel(); MainDialog& mainDlg_; +diff -Naur -x '*.orig' -x '*.rej' -x '*.git*' 11.4-1/wx+/no_flicker.h 11.4-2/wx+/no_flicker.h +--- 11.4-1/wx+/no_flicker.h 2020-12-08 08:15:29.436156549 -0500 ++++ 11.4-2/wx+/no_flicker.h 2020-12-08 20:11:25.066820270 -0500 +@@ -70,7 +70,7 @@ + ZEN_ON_SCOPE_EXIT(richCtrl.EndSuppressUndo()); + + //fix mouse scroll speed: why the FUCK is this even necessary! +- richCtrl.SetLineHeight(richCtrl.GetCharHeight()); ++ //richCtrl.SetLineHeight(richCtrl.GetCharHeight()); // this is not even documented in wxWidgets 3.1.5! + + //get rid of margins and space between text blocks/"paragraphs" + richCtrl.SetMargins({0, 0}); |