diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-01-09 09:48:07 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-01-09 12:36:03 +0100 |
commit | d2313a5d052373f86174f9de4e24153024f6a8a2 (patch) | |
tree | fea07089e7cf4ff532ad326cd497f34a4959cb2e /vcl | |
parent | 096b455583aa23d554cd05b1fac8909b7e10e355 (diff) |
Resolves: tdf#122467 drop down field name is too narrow
ellipise only when we have to
Change-Id: I79820dc84fc9ac0a755700c70bca9edbb14cf371
Reviewed-on: https://gerrit.libreoffice.org/66000
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 265a921f3f7c..b254a68cdae1 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -6398,6 +6398,7 @@ class GtkInstanceComboBox : public GtkInstanceContainer, public vcl::ISearchable private: GtkComboBox* m_pComboBox; GtkTreeModel* m_pTreeModel; + GtkCellRenderer* m_pTextRenderer; GtkMenu* m_pMenu; std::unique_ptr<comphelper::string::NaturalStringSorter> m_xSorter; vcl::QuickSelectionEngine m_aQuickSelectionEngine; @@ -6710,23 +6711,19 @@ public: if (!g_list_length(cells)) { //Always use the same text column renderer layout - GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_end(GTK_CELL_LAYOUT(m_pComboBox), text_renderer, true); - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(m_pComboBox), text_renderer, "text", 0, nullptr); - g_object_set(G_OBJECT(text_renderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); + m_pTextRenderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_end(GTK_CELL_LAYOUT(m_pComboBox), m_pTextRenderer, true); + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(m_pComboBox), m_pTextRenderer, "text", 0, nullptr); } else { - // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let - // the popup menu render them in full, in the interim allow the text to wrap in both cases - GtkCellRenderer* cell = static_cast<GtkCellRenderer*>(cells->data); - g_object_set(G_OBJECT(cell), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); + m_pTextRenderer = static_cast<GtkCellRenderer*>(cells->data); if (g_list_length(cells) == 2) { //The ComboBox is always going to show the column associated with //the entry when there is one, left to its own devices this image //column will be after it, but we want it before - gtk_cell_layout_reorder(GTK_CELL_LAYOUT(m_pComboBox), cell, 1); + gtk_cell_layout_reorder(GTK_CELL_LAYOUT(m_pComboBox), m_pTextRenderer, 1); } } g_list_free(cells); @@ -6773,7 +6770,18 @@ public: GtkCellRenderer* cell = static_cast<GtkCellRenderer*>(cells->data); GtkRequisition size; gtk_cell_renderer_get_preferred_size(cell, m_pWidget, &size, nullptr); - gtk_cell_renderer_set_fixed_size(cell, nWidth, size.height); + if (nWidth < size.width) + { + // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let + // the popup menu render them in full, in the interim ellipse both + g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); + gtk_cell_renderer_set_fixed_size(cell, nWidth, size.height); + } + else + { + g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_NONE, nullptr); + gtk_cell_renderer_set_fixed_size(cell, size.width, size.height); + } g_list_free(cells); gtk_widget_set_size_request(m_pWidget, nWidth, nHeight); |