diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-01-15 15:34:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-16 17:53:31 +0100 |
commit | 444e0ce07c6652346dcc34f8d9ec4a4403b2109b (patch) | |
tree | 66dca5dc35f9aefe7144640dbf1d51ce870d89bd /vcl | |
parent | 7a56ed9edff41867a93c8ea06c0f874793f8e88d (diff) |
tdf#137695 shrink widget height below natural min within data browser
Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f
Change-Id: Iba3c12376200b7ce800b48155a4b84ca2e47d63f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109380
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/uiconfig/ui/combobox.ui | 1 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkdata.cxx | 13 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/vcl/uiconfig/ui/combobox.ui b/vcl/uiconfig/ui/combobox.ui index 2c25d7ac8620..23cfe7ed9e31 100644 --- a/vcl/uiconfig/ui/combobox.ui +++ b/vcl/uiconfig/ui/combobox.ui @@ -3,6 +3,7 @@ <interface domain="vcl"> <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="box"> + <property name="name">combobox</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="no_show_all">True</property> diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 58109aae148a..cef4b3e0d30c 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -522,14 +522,19 @@ void GtkSalData::Init() G_CALLBACK(signalMonitorsChanged), GetGtkDisplay() ); /* - set a provider to allow certain buttons to have no padding + set a provider to allow certain widgets to have no padding a) little close button in menubar to close back to start-center - b) small buttons in view->data sources - c) small toolbar button in infobars + b) and small buttons in view->data sources (button.small-button) + c) small toolbar button in infobars (toolbar.small-button button) + d) comboboxes in the data browser for tdf#137695 (box#combobox button.small-button, + which would instead be combobox button.small-button if we didn't replace GtkComboBox, + see GtkInstanceComboBox for an explanation for why we do that) + e) entry in the data browser for tdf#137695 (entry.small-button) */ GtkCssProvider* pSmallButtonProvider = gtk_css_provider_new(); - static const gchar data[] = "button.small-button, toolbar.small-button button { " + static const gchar data[] = + "button.small-button, toolbar.small-button button, combobox.small-button *.combo, box#combobox.small-button *.combo, entry.small-button { " "padding: 0;" "margin-left: 0px;" "margin-right: 0px;" diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 963f46f90b27..da649144a750 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -15284,6 +15284,10 @@ public: , m_nMaxMRUCount(0) { int nActive = gtk_combo_box_get_active(m_pComboBox); + + if (gtk_style_context_has_class(gtk_widget_get_style_context(GTK_WIDGET(m_pComboBox)), "small-button")) + gtk_style_context_add_class(gtk_widget_get_style_context(GTK_WIDGET(getContainer())), "small-button"); + insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer())); gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false); gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true); |