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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index e808aabc70ff..83fc164c4805 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -613,6 +613,10 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem } } + const bool bDockingSupportCrippled = !StyleSettings::GetDockingFloatsSupported(); + if (bDockingSupportCrippled) + rElementData.m_bFloating = false; + return true; } catch (const NoSuchElementException&) |