From 6307193b3dbbebba12ff7b8534b86cf70855c8a4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Nov 22 2016 14:26:41 +0000
Subject: Resolves: rhbz#1397181 toolbar layout manager not respecting toolbar drag cancel


---

diff --git a/0001-Resolves-rhbz-1397181-toolbar-layout-manager-not-res.patch b/0001-Resolves-rhbz-1397181-toolbar-layout-manager-not-res.patch
new file mode 100644
index 0000000..98befed
--- /dev/null
+++ b/0001-Resolves-rhbz-1397181-toolbar-layout-manager-not-res.patch
@@ -0,0 +1,74 @@
+From 19c3559e873e79a178e9c4932363e2a2cc1b9ac0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Tue, 22 Nov 2016 13:43:32 +0000
+Subject: [PATCH] Resolves: rhbz#1397181 toolbar layout manager not respecting
+ drag cancel
+
+plus restore original mbDockCanceled state after wayland-enforced
+cancel otherwise next drag won't work
+
+Change-Id: Idefed25b925b36d0bf72b77609c4fc2eb47f71b9
+---
+ framework/source/layoutmanager/toolbarlayoutmanager.cxx | 3 +++
+ vcl/source/window/dockmgr.cxx                           | 3 +++
+ vcl/source/window/dockwin.cxx                           | 2 ++
+ 3 files changed, 8 insertions(+)
+
+diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+index 583d622..b770fd8 100644
+--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
++++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+@@ -3476,6 +3476,9 @@ throw (uno::RuntimeException, std::exception)
+ void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e )
+ throw (uno::RuntimeException, std::exception)
+ {
++    if (e.bCancelled)
++        return;
++
+     bool bDockingInProgress( false );
+     bool bStartDockFloated( false );
+     bool bFloating( false );
+diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
+index 9012a90..1467df8 100644
+--- a/vcl/source/window/dockmgr.cxx
++++ b/vcl/source/window/dockmgr.cxx
+@@ -935,6 +935,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
+ {
+     Rectangle aRect( rRect );
+ 
++    bool bOrigDockCanceled = mbDockCanceled;
+     if (bFloatMode && !StyleSettings::GetDockingFloatsSupported())
+         mbDockCanceled = true;
+ 
+@@ -971,6 +972,8 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
+ 
+     // must be enabled in Window::Notify to prevent permanent docking during mouse move
+     mbStartDockingEnabled = false;
++
++    mbDockCanceled = bOrigDockCanceled;
+ }
+ 
+ bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
+diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
+index 8f63c69..7d3ba8b 100644
+--- a/vcl/source/window/dockwin.cxx
++++ b/vcl/source/window/dockwin.cxx
+@@ -589,6 +589,7 @@ bool DockingWindow::Docking( const Point&, Rectangle& )
+ 
+ void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
+ {
++    bool bOrigDockCanceled = mbDockCanceled;
+     if (bFloatMode && !StyleSettings::GetDockingFloatsSupported())
+         mbDockCanceled = true;
+ 
+@@ -614,6 +615,7 @@ void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
+             Show();
+     }
+     mbDocking = false;
++    mbDockCanceled = bOrigDockCanceled;
+ }
+ 
+ bool DockingWindow::PrepareToggleFloatingMode()
+-- 
+2.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index e42fcf7..9d2f80b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -259,8 +259,9 @@ Patch27: 0001-gtk3-problems-with-gdk_drag_status-under-wayland.patch
 Patch28: 0001-gtk-under-wayland-tracking-the-window-position-is-wo.patch
 Patch29: 0001-Resolves-rhbz-1396827-update-geom-on-mouse-click-as-.patch
 Patch30: 0001-avoid-loss-of-text-in-edited-placeholder.patch
-Patch31: 0001-drawing-shapes-aren-t-tracking-style-name-changes-co.pat
+Patch31: 0001-drawing-shapes-aren-t-tracking-style-name-changes-co.patch
 Patch32: 0001-set-the-search-toolbar-so-it-doesn-t-move-around-wrt.patch
+Patch33: 0001-Resolves-rhbz-1397181-toolbar-layout-manager-not-res.patch
 
 %if 0%{?fedora} >= 26
 Patch400: 0001-Switch-from-orcus-0.11-to-orcus-0.12.patch
@@ -2322,6 +2323,7 @@ done
 - avoid loss of text in edited placeholder on save
 - set find toolbox so it doesn't appear to jump around in table/numbering contexts
 - drawing shapes not seeing style name change
+- Resolves: rhbz#1397181 toolbar layout manager not respecting toolbar drag cancel
 
 * Mon Nov 21 2016 Caolán McNamara <caolanm@redhat.com> - 1:5.2.3.3-8
 - Resolves: rhbz#1396827 wayland provides exciting x_root positions on mouse click