From 870a6254ccc129a1116e4bd3bdaca0bce6be4c39 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mar 13 2017 14:35:39 +0000 Subject: Resolves: rhbz#1431478 color popups in wrong place under wayland --- diff --git a/0001-disable-tearability-of-color-window.patch b/0001-disable-tearability-of-color-window.patch new file mode 100644 index 0000000..7ea9a5c --- /dev/null +++ b/0001-disable-tearability-of-color-window.patch @@ -0,0 +1,40 @@ +From ac6f8a49b6dc0b8c8edbba111e9913c87f65e19b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 13 Mar 2017 14:04:30 +0000 +Subject: [PATCH] disable tearability of color window + +Change-Id: I5e01bf274f1a621f8d78e26ba8202451800c8ad4 +--- + svx/source/tbxctrls/tbcontrl.cxx | 3 +-- + svx/uiconfig/ui/colorwindow.ui | 1 - + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx +index 28684f4..c85b3e6 100644 +--- a/svx/source/tbxctrls/tbcontrl.cxx ++++ b/svx/source/tbxctrls/tbcontrl.cxx +@@ -2759,8 +2759,7 @@ VclPtr SvxColorToolBoxControl::CreatePopupWindow() + break; + } + +- pColorWin->StartPopupMode( &GetToolBox(), +- FloatWinPopupFlags::AllowTearOff|FloatWinPopupFlags::NoAppFocusClose ); ++ pColorWin->StartPopupMode( &GetToolBox(), FloatWinPopupFlags::NoAppFocusClose ); + pColorWin->StartSelection(); + SetPopupWindow( pColorWin ); + if ( !bSidebarType ) +diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui +index 9482562..702bee3 100644 +--- a/svx/uiconfig/ui/colorwindow.ui ++++ b/svx/uiconfig/ui/colorwindow.ui +@@ -25,7 +25,6 @@ + True + popup-menu + True +- False + False + + +-- +2.9.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 073cdf1..ded2fb0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -275,6 +275,7 @@ Patch39: 0001-show-the-last-gif-frame-when-the-animation-ends.patch Patch40: 0001-tdf-106218-sw-compare-document-tweak-special-handlin.patch Patch41: 0001-rhbz-1431476-dnd-has-started-copying-instead-of-movi.patch Patch42: 0001-Resolves-rhbz-1431540-crash-in-SwDBManager-releaseRe.patch +Patch43: 0001-disable-tearability-of-color-window.patch %if 0%{?fedora} >= 26 Patch400: 0001-Switch-from-orcus-0.11-to-orcus-0.12.patch @@ -2355,6 +2356,7 @@ done * Mon Mar 13 2017 Caolán McNamara - 1:5.2.6.2-4 - Resolves: rhbz#1431476 dnd has started copying instead of moving slides - Resolves: rhbz#1431540 crash in SwDBManager releaseRef +- Resolves: rhbz#1431478 color popups in wrong place under wayland * Thu Mar 09 2017 Caolán McNamara - 1:5.2.6.2-3 - show the last gif frame when the animation ends