diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-12-22 17:08:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-24 17:48:00 +0200 |
| commit | 16309a9516c1f173056fc103c6428e74217c7927 (patch) | |
| tree | a9c469560345db2047857836cb708971112471a3 /vcl/uiconfig/ui | |
| parent | 1d23ff22c112f5b2bac23d9329a72c399007bf98 (diff) | |
weld StylesPropertyPanel
and SvxStyleToolBoxControl, etc.
use a GtkOverlay to support the submenu hackery in the Style
wysiwyg combobox dropdown
Change-Id: I17baa56f382243070ee49e6d707e97324e4f4d67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85720
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/uiconfig/ui')
| -rw-r--r-- | vcl/uiconfig/ui/combobox.ui | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui index e5d31743fcf1..24b07878f69b 100644 --- a/vcl/uiconfig/ui/combobox.ui +++ b/vcl/uiconfig/ui/combobox.ui @@ -64,6 +64,20 @@ <class name="linked"/> </style> </object> + <object class="GtkMenuButton" id="overlaybutton"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="draw_indicator">True</property> + <property name="use_popover">False</property> + <child> + <object class="GtkImage" id="overlayarrow"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">pan-down-symbolic</property> + </object> + </child> + </object> <object class="GtkWindow" id="popup"> <property name="name">gtk-combobox-popup-window</property> <property name="can_focus">False</property> @@ -75,26 +89,34 @@ <placeholder/> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> + <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> + <property name="can_focus">False</property> <child> - <object class="GtkTreeView" id="treeview"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="enable_search">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <property name="activate_on_single_click">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <child> + <object class="GtkTreeView" id="treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="enable_search">False</property> + <property name="search_column">0</property> + <property name="show_expanders">False</property> + <property name="activate_on_single_click">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + </object> </child> </object> + <packing> + <property name="index">-1</property> + </packing> </child> </object> </child> |