[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 6a1afa08131bb621cac9a350786b2e41d10afef3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 10 15:14:35 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Feb 10 21:50:08 2020 +0100

    operate on the text renderer cell, not the first cell
    
    Change-Id: Id208150e45a4a5724f1e001522ee8fd94a64a91a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88375
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7a9d53f8a61f..5fc58f466515 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -12297,9 +12297,6 @@ public:
     virtual void set_size_request(int nWidth, int nHeight) override
     {
         // tweak the cell render to get a narrower size to stick
-        GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox));
-        GtkCellRenderer* cell = static_cast<GtkCellRenderer*>(cells->data);
-
         if (nWidth != -1)
         {
             // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let
@@ -12309,8 +12306,8 @@ public:
             // to find out how much of the width of the combobox belongs to the cell, set
             // the cell and widget to the min cell width and see what the difference is
             int min;
-            gtk_cell_renderer_get_preferred_width(cell, m_pWidget, &min, nullptr);
-            gtk_cell_renderer_set_fixed_size(cell, min, -1);
+            gtk_cell_renderer_get_preferred_width(m_pTextRenderer, m_pWidget, &min, nullptr);
+            gtk_cell_renderer_set_fixed_size(m_pTextRenderer, min, -1);
             gtk_widget_set_size_request(m_pWidget, min, -1);
             int nNonCellWidth = get_preferred_size().Width() - min;
 
@@ -12319,17 +12316,15 @@ public:
             {
                 // now set the cell to the max width which it can be within the
                 // requested widget width
-                gtk_cell_renderer_set_fixed_size(cell, nWidth - nNonCellWidth, -1);
+                gtk_cell_renderer_set_fixed_size(m_pTextRenderer, nWidth - nNonCellWidth, -1);
             }
         }
         else
         {
             g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_NONE, nullptr);
-            gtk_cell_renderer_set_fixed_size(cell, -1, -1);
+            gtk_cell_renderer_set_fixed_size(m_pTextRenderer, -1, -1);
         }
 
-        g_list_free(cells);
-
         gtk_widget_set_size_request(m_pWidget, nWidth, nHeight);
     }