diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 14:27:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-05 14:47:29 +0100 |
| commit | 43b13e9b73e425683977473ab171e1e140dba6cc (patch) | |
| tree | ddc37334272fb10dc732be6b77527fe0a3c84359 /svx | |
| parent | eb6d4547a044b3eb7cb8945977e45647a37df28f (diff) | |
NoAppFocusClose is for menus that have submenus
and don't want the parent menu to be auto popped down
when the submenu gains focus.
or floating windows that explicitly don't want to go away when they lose focus,
which all these popups aren't
Change-Id: I53f1f3ac586ff295597c4b9046032d3d976d053e
Diffstat (limited to 'svx')
4 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index d65d2bdfa692..a62d414ae0ae 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -1325,8 +1325,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) mxTrGrPopup = VclPtr<AreaTransparencyGradientPopup>::Create(pToolBox, *this); mxTrGrPopup->Rearrange(mpFloatTransparenceItem.get()); OSL_ASSERT( pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SIDEBARGRADIENT); - mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::Down | - FloatWinPopupFlags::NoAppFocusClose); + mxTrGrPopup->StartPopupMode(pToolBox, FloatWinPopupFlags::Down); } IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void) diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 14684e919b29..d8c549f0d31f 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -41,7 +41,7 @@ VclPtr<SfxPopupWindow> ParaLineSpacingPopup::CreatePopupWindow() { VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId()); - pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose); + pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus); SetPopupWindow(pControl); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 266b9d392aae..7ce654fe3009 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -40,7 +40,7 @@ VclPtr<SfxPopupWindow> TextCharacterSpacingPopup::CreatePopupWindow() { VclPtr<TextCharacterSpacingControl> pControl = VclPtr<TextCharacterSpacingControl>::Create(GetSlotId()); - pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose); + pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus); SetPopupWindow(pControl); diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 975861cf6dc8..c8fdd697544a 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -45,7 +45,7 @@ void TextUnderlinePopup::initialize( const css::uno::Sequence< css::uno::Any >& VclPtr<SfxPopupWindow> TextUnderlinePopup::CreatePopupWindow() { VclPtr<TextUnderlineControl> pControl = VclPtr<TextUnderlineControl>::Create(GetSlotId()); - pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose); + pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus); SetPopupWindow(pControl); return pControl; |