diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-04 10:41:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-04 13:14:13 +0100 |
| commit | cccc98921e04bd16651b8ff92f82ff9073a1b12c (patch) | |
| tree | 9f246e80fa3a49752528583cf9ce5499c3c1fc71 /sfx2 | |
| parent | 6b439e81a1916bcb42fb0fc24b1aea06e2da0d1e (diff) | |
master slide panel shouldn't have "more options" button
default the toolbox to hidden and show it if "more options" is enabled
Change-Id: I6ff867268809d949e7854e0e76d3e45c8806797b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111953
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/DeckTitleBar.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/sidebar/PanelTitleBar.cxx | 4 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/decktitlebar.ui | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/paneltitlebar.ui | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 91d95d69f264..59e9aa0db6c8 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -119,7 +119,7 @@ void DeckTitleBar::SetCloserVisible (const bool bIsCloserVisible) mbIsCloserVisible = bIsCloserVisible; - mxToolBox->set_item_visible("button", mbIsCloserVisible); + mxToolBox->set_visible(mbIsCloserVisible); } void DeckTitleBar::HandleToolBoxItemClick() diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 7f2ff3214722..ddde9ca7aa6f 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -91,7 +91,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, return; if (!msMoreOptionsCommand.isEmpty()) - mxToolBox->set_item_visible(msIdent, false); + mxToolBox->hide(); msMoreOptionsCommand = rsCommandName; @@ -108,7 +108,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, ControllerFactory::CreateToolBoxController( *mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame, rxController, true); - mxToolBox->set_item_visible(msIdent, true); + mxToolBox->show(); } void PanelTitleBar::HandleToolBoxItemClick() diff --git a/sfx2/uiconfig/ui/decktitlebar.ui b/sfx2/uiconfig/ui/decktitlebar.ui index bbfcba7bf69b..8c34a7d5b415 100644 --- a/sfx2/uiconfig/ui/decktitlebar.ui +++ b/sfx2/uiconfig/ui/decktitlebar.ui @@ -52,8 +52,8 @@ </child> <child> <object class="GtkToolbar" id="toolbar"> - <property name="visible">True</property> <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="toolbar-style">icons</property> <property name="show-arrow">False</property> <property name="icon_size">2</property> diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui b/sfx2/uiconfig/ui/paneltitlebar.ui index 2e352bf21a4f..eac7c877cf2e 100644 --- a/sfx2/uiconfig/ui/paneltitlebar.ui +++ b/sfx2/uiconfig/ui/paneltitlebar.ui @@ -59,8 +59,8 @@ </child> <child> <object class="GtkToolbar" id="toolbar"> - <property name="visible">True</property> <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="toolbar-style">icons</property> <property name="show-arrow">False</property> <property name="icon_size">2</property> |