|
 |
91334d |
From e60e1d83dca62060585cf4054cda9e897176590c Mon Sep 17 00:00:00 2001
|
|
|
91334d |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
91334d |
Date: Thu, 23 Mar 2017 14:13:27 +0000
|
|
|
91334d |
Subject: [PATCH] Related: rhbz#1334915 tdf#100158 hack using startcenter icon
|
|
|
91334d |
under wayland
|
|
|
91334d |
|
|
|
91334d |
cause I can get no traction with gnome#779143 to allow changing wayland
|
|
|
91334d |
app_ids for windows, so might as well bodge something to make us look
|
|
|
91334d |
less pathetic than the broken app icon
|
|
|
91334d |
|
|
|
91334d |
Change-Id: I9810ba4908dd06a2fdbb2e58e7ad6ff4978ddd43
|
|
|
91334d |
---
|
|
|
91334d |
vcl/unx/gtk3/gtk3gtkframe.cxx | 20 ++++++++++++++++++++
|
|
|
91334d |
1 file changed, 20 insertions(+)
|
|
|
91334d |
|
|
|
91334d |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
91334d |
index 1a4823e..745d297 100644
|
|
|
91334d |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
91334d |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
91334d |
@@ -1446,7 +1446,27 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
|
|
|
91334d |
m_pParent->addGrabLevel();
|
|
|
91334d |
}
|
|
|
91334d |
|
|
|
91334d |
+#if defined(GDK_WINDOWING_WAYLAND)
|
|
|
91334d |
+ //rhbz#1334915, gnome#779143, tdf#100158
|
|
|
91334d |
+ //gtk under wayland lacks a way to change the app_id
|
|
|
91334d |
+ //of a window, so brute force everything as a
|
|
|
91334d |
+ //startcenter when initially shown to at least get
|
|
|
91334d |
+ //the default LibreOffice icon and not the broken
|
|
|
91334d |
+ //app icon
|
|
|
91334d |
+ if (GDK_IS_WAYLAND_DISPLAY(getGdkDisplay()))
|
|
|
91334d |
+ {
|
|
|
91334d |
+ OString sOrigName(g_get_prgname());
|
|
|
91334d |
+ g_set_prgname("libreoffice-startcenter");
|
|
|
91334d |
+ gtk_widget_show(m_pWindow);
|
|
|
91334d |
+ g_set_prgname(sOrigName.getStr());
|
|
|
91334d |
+ }
|
|
|
91334d |
+ else
|
|
|
91334d |
+ {
|
|
|
91334d |
+ gtk_widget_show(m_pWindow);
|
|
|
91334d |
+ }
|
|
|
91334d |
+#else
|
|
|
91334d |
gtk_widget_show(m_pWindow);
|
|
|
91334d |
+#endif
|
|
|
91334d |
|
|
|
91334d |
if( isFloatGrabWindow() )
|
|
|
91334d |
{
|
|
|
91334d |
--
|
|
|
91334d |
2.9.3
|
|
|
91334d |
|