|
 |
d900c98 |
From 011f42c0c6104228f5c15daae58e432ccf2be69d Mon Sep 17 00:00:00 2001
|
|
|
d900c98 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
d900c98 |
Date: Thu, 17 Dec 2015 17:04:52 +0000
|
|
|
d900c98 |
Subject: [PATCH 2/2] disable tearability of color window
|
|
|
d900c98 |
|
|
|
d900c98 |
the new popup controllers take care to destroy the popup
|
|
|
d900c98 |
and recreate a non-popup and move the contents into it
|
|
|
d900c98 |
|
|
|
d900c98 |
so we should re-implement the color popup as one of those
|
|
|
d900c98 |
in the meantime, turn it into a non-tearable thing
|
|
|
d900c98 |
|
|
|
d900c98 |
Change-Id: I6ba26bf19badcbf910b7200b7e1b8b2a64ce4eec
|
|
|
d900c98 |
---
|
|
|
d900c98 |
svx/source/tbxctrls/tbcontrl.cxx | 3 +--
|
|
|
d900c98 |
svx/uiconfig/ui/colorwindow.ui | 1 -
|
|
|
d900c98 |
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
d900c98 |
|
|
|
d900c98 |
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
|
|
|
d900c98 |
index ae696ae..28691dc 100644
|
|
|
d900c98 |
--- a/svx/source/tbxctrls/tbcontrl.cxx
|
|
|
d900c98 |
+++ b/svx/source/tbxctrls/tbcontrl.cxx
|
|
|
d900c98 |
@@ -2659,8 +2659,7 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
|
|
|
d900c98 |
break;
|
|
|
d900c98 |
}
|
|
|
d900c98 |
|
|
|
d900c98 |
- pColorWin->StartPopupMode( &GetToolBox(),
|
|
|
d900c98 |
- FloatWinPopupFlags::AllowTearOff|FloatWinPopupFlags::NoAppFocusClose );
|
|
|
d900c98 |
+ pColorWin->StartPopupMode( &GetToolBox(), FloatWinPopupFlags::NoAppFocusClose );
|
|
|
d900c98 |
pColorWin->StartSelection();
|
|
|
d900c98 |
SetPopupWindow( pColorWin );
|
|
|
d900c98 |
if ( !bSidebarType )
|
|
|
d900c98 |
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
|
|
|
d900c98 |
index 9482562..702bee3 100644
|
|
|
d900c98 |
--- a/svx/uiconfig/ui/colorwindow.ui
|
|
|
d900c98 |
+++ b/svx/uiconfig/ui/colorwindow.ui
|
|
|
d900c98 |
@@ -25,7 +25,6 @@
|
|
|
d900c98 |
<property name="destroy_with_parent">True</property>
|
|
|
d900c98 |
<property name="type_hint">popup-menu</property>
|
|
|
d900c98 |
<property name="skip_pager_hint">True</property>
|
|
|
d900c98 |
- <property name="decorated">False</property>
|
|
|
d900c98 |
<property name="deletable">False</property>
|
|
|
d900c98 |
<child>
|
|
|
d900c98 |
<object class="GtkBox" id="box1">
|
|
|
d900c98 |
--
|
|
|
d900c98 |
2.5.0
|
|
|
d900c98 |
|