summaryrefslogtreecommitdiff
path: root/freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2023-04-10 13:58:05 +0000
committerB. Stack <bgstack15@gmail.com>2023-04-10 13:58:05 +0000
commit2cc98d23908a2403ada11aaaf83812cea5f09ba1 (patch)
treee57a448fd3727fa02aa9f521a4d210c4613492f7 /freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch
parentmerge (diff)
parentffs 12.2 rc1 (diff)
downloadstackrpms-2cc98d23908a2403ada11aaaf83812cea5f09ba1.tar.gz
stackrpms-2cc98d23908a2403ada11aaaf83812cea5f09ba1.tar.bz2
stackrpms-2cc98d23908a2403ada11aaaf83812cea5f09ba1.zip
Merge branch 'freefilesync-bump' into 'master'
ffs 12.2 rc1 See merge request bgstack15/stackrpms!345
Diffstat (limited to 'freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch')
-rw-r--r--freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch b/freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch
index 7f2443d..15948d2 100644
--- a/freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch
+++ b/freefilesync/debian/patches/ffs_tooltips_no_taskbar.patch
@@ -1,7 +1,7 @@
-Version: 12.0
-Date: 2023-01-22
+Version: 12.2
+Date: 2023-04-03
Author: bgstack15
-Message: Suppress taskbar entry for tooltip "window"
+Message: Suppress taskbar entry for tooltip "window". Upstream declined this patch (https://freefilesync.org/forum/viewtopic.php?t=9898) so it must continue here.
--- a/wx+/tooltip.cpp
+++ b/wx+/tooltip.cpp
@@ -9,6 +9,7 @@
@@ -16,8 +16,8 @@ Message: Suppress taskbar entry for tooltip "window"
{
public:
TooltipDlgGenerated(wxWindow* parent) : //Suse Linux/X11: needs parent window, else there are z-order issues
-- wxDialog(parent, wxID_ANY, L"" /*title*/, wxDefaultPosition, wxDefaultSize, 0 /*style*/)
-+ wxDialog(parent, wxID_ANY, L"" /*title*/, wxDefaultPosition, wxDefaultSize, wxFRAME_NO_TASKBAR /*style*/)
+- wxDialog(parent, wxID_ANY, L"" /*title*/, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER /*style*/)
++ wxDialog(parent, wxID_ANY, L"" /*title*/, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR /*style*/)
+ //wxSIMPLE_BORDER side effect: removes title bar on KDE
{
SetSizeHints(wxDefaultSize, wxDefaultSize);
- SetExtraStyle(this->GetExtraStyle() | wxWS_EX_TRANSIENT);
bgstack15