diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-10 13:20:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-11 08:51:10 +0000 |
| commit | a6d324f30bd5cfd09d54614d8df67b7857550429 (patch) | |
| tree | 2d5d64d2aac6e104ac811cdc7272e43ca29d03d5 /vcl/unx/gtk3 | |
| parent | 39f14ada958ff2cdd4ec5f7454983bfc5c35f89d (diff) | |
Resolves: rhbz#1391418 wayland toolbars can't be docked after undocking
see gnome#768128 for extra details
under wayland, given the misery here I'm going to just disable toggling between
docked and undocked under wayland, and throw away user config on toggling
docked/undocked away from the defaults. You can still drag docked things around
to new docking position, but you can't pull them out of the dock to float.
non-wayland is unaffected
Change-Id: Iaa859f3420e6d1b103a8b93d1ad8f82dbffe75d4
Reviewed-on: https://gerrit.libreoffice.org/30752
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk3')
| -rw-r--r-- | vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx index fc2bb822d447..286e4a28fc60 100644 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx @@ -18,7 +18,9 @@ #include <vcl/settings.hxx> #include "unx/fontmanager.hxx" #include "cairo_gtk3_cairo.hxx" - +#if defined(GDK_WINDOWING_WAYLAND) +# include <gdk/gdkwayland.h> +#endif #include <boost/optional.hpp> GtkStyleContext* GtkSalGraphics::mpWindowStyle = nullptr; @@ -2898,6 +2900,14 @@ void GtkData::initNWF() pSVData->maNWFData.mbNoFocusRectsForFlatButtons = true; pSVData->maNWFData.mbAutoAccel = true; pSVData->maNWFData.mbEnableAccel = true; + +#if defined(GDK_WINDOWING_WAYLAND) + //gnome#768128 for the car crash that is wayland + //and floating dockable toolbars + GdkDisplay *pDisplay = gdk_display_get_default(); + if (GDK_IS_WAYLAND_DISPLAY(pDisplay)) + pSVData->maNWFData.mbDockingFloatsSupported = false; +#endif } void GtkData::deInitNWF() |