lazarus bugtracker

Index: lcl/interfaces/gtk2/gtk2wsstdctrls.pp
===================================================================
--- lcl/interfaces/gtk2/gtk2wsstdctrls.pp	(revision 36942)
+++ lcl/interfaces/gtk2/gtk2wsstdctrls.pp	(working copy)
@@ -30,7 +30,7 @@
   // Bindings
   glib2,  gdk2, gtk2,
   // RTL, FCL, LCL
-  Classes, SysUtils, Math, Controls, Graphics,
+  types, Classes, SysUtils, Math, Controls, Graphics,
   StdCtrls, LMessages, LCLType, LCLProc,
   // Widgetset
   WSControls, WSProc, WSStdCtrls, Gtk2Int, Gtk2Def,
@@ -1494,6 +1494,105 @@
   SetCallbacks(ACustomComboBox, Box, AWidgetInfo);
 end;
 
+procedure LCLIntfCellRenderer_ComboBoxCellDataFunc(cell_layout:PGtkCellLayout;
+  cell: PGtkCellRenderer; tree_model: PGtkTreeModel; iter: PGtkTreeIter;
+  data: gpointer); cdecl;
+var
+  LCLCellRenderer: PLCLIntfCellRenderer absolute cell;
+  WidgetInfo: PWidgetInfo;
+  APath: PGtkTreePath;
+  Str: String;
+  Value: TGValue;
+  ComboBox: TCustomComboBox;
+  ComboWidget: PGtkComboBox;
+  ComboArrow: PGtkWidget;
+  ComboWidth: Integer;
+  ArrowWidth: Integer;
+  i: Integer;
+  MaxW: Integer;
+  DC: HDC;
+  ASize: TSize;
+begin
+  if G_IS_OBJECT(cell) = false then
+    exit;
+
+  APath := gtk_tree_model_get_path(tree_model,iter);
+  LCLCellRenderer^.Index := gtk_tree_path_get_indices(APath)^;
+  LCLCellRenderer^.ColumnIndex := -1;
+  gtk_tree_path_free(APath);
+
+  WidgetInfo := PWidgetInfo(data);
+  if WidgetInfo = nil then
+    exit;
+
+  if TCustomComboBox(WidgetInfo^.LCLObject).Style >= csOwnerDrawFixed then
+    exit;
+  // DebugLn(['LCLIntfCellRenderer_ComboBoxCellDataFunc stamp=',iter^.stamp,' tree_model=',dbgs(tree_model),' cell=',dbgs(cell),' WidgetInfo=',WidgetInfo <> nil,' Time=',TimeToStr(Now)]);
+  ComboBox := TCustomComboBox(WidgetInfo^.LCLObject);
+  i := LCLCellRenderer^.Index;
+  if (i >= 0) and (i < ComboBox.Items.Count) then
+  begin
+    Value.g_type := G_TYPE_BOOLEAN;
+    Value.data[0].v_int := 0;
+    gtk_widget_style_get_property(WidgetInfo^.CoreWidget,'appears-as-list',@Value);
+    // CHECK OFFSET WHEN combo appears as list.
+    // if Value.data[0].v_int = 0 then it's gtks standard menu not real list.
+    DC := Gtk2WidgetSet.GetDC(0); // use DC, TCombobox.Canvas gtk2 leaks for some reason.
+    try
+      Str := ComboBox.Items.Strings[i];
+      if Gtk2WidgetSet.GetTextExtentPoint32(DC, PChar(Str), length(Str), ASize) then
+      begin
+        ComboWidget := PGtkComboBox(WidgetInfo^.CoreWidget);
+
+        if ComboBox.Style = csDropDown then
+          ComboArrow := PGtkComboBoxPrivate(ComboWidget^.priv)^.arrow
+        else
+          ComboArrow := PGtkComboBoxPrivate(ComboWidget^.priv)^.button;
+
+        if ComboArrow^.allocation.width <= 1 then
+          ArrowWidth := 28 // standard gtk size of arrow
+        else
+          ArrowWidth := ComboBox.ClientWidth - ComboArrow^.allocation.width;
+
+        if not ComboBox.DroppedDown then
+          ComboWidth := ComboBox.ClientWidth - ArrowWidth
+        else
+          ComboWidth := ComboBox.ClientWidth;
+
+        if ASize.cx >= ComboWidth then
+        begin
+          MaxW := 0;
+
+          if Gtk2WidgetSet.GetTextExtentExPoint(DC, PChar(Str), Length(Str),
+            ComboWidth, @MaxW, nil, ASize) then
+          begin
+            if MaxW - 3 > 0 then
+            begin
+              if ComboBox.DroppedDown then
+                Str := UTF8Copy(Str, 1, MaxW - 4) + '...'
+              else
+                Str := UTF8Copy(Str, 1, MaxW - 3) + '...';
+            end;
+            Value.g_type := G_TYPE_STRING;
+            Value.data[0].v_pointer := PChar(Str);
+            g_object_set_property(PGObject(cell), 'text', @Value);
+          end;
+        end;
+      end;
+    finally
+      Gtk2WidgetSet.DeleteDC(DC);
+    end;
+    if not ComboBox.DroppedDown and (ComboBox.Style = csDropDownList) then
+    begin
+      Value.g_type := G_TYPE_UINT;
+      Value.data[0].v_uint := 0;
+      g_object_get_property(PgObject(cell),'ypad',@Value);
+      Value.data[0].v_int := 0;
+      g_object_set_property(PGObject(cell), 'ypad', @Value);
+    end;
+  end;
+end;
+
 class procedure TGtk2WSCustomComboBox.SetRenderer(
   const ACustomComboBox: TCustomComboBox; AWidget: PGtkWidget; AWidgetInfo: PWidgetInfo);
 var
@@ -1506,7 +1605,7 @@
   if not (ACustomComboBox.Style in [csOwnerDrawFixed, csOwnerDrawVariable]) then
     gtk_cell_layout_set_attributes(PGtkCellLayout(AWidget), renderer, ['text', 0, nil]);
   gtk_cell_layout_set_cell_data_func(PGtkCellLayout(AWidget), renderer,
-    @LCLIntfCellRenderer_CellDataFunc, AWidgetInfo, nil);
+    @LCLIntfCellRenderer_ComboBoxCellDataFunc, AWidgetInfo, nil);
 end;
 
 procedure GtkComboFocus({%H-}AWidget: PGtkWidget; WidgetInfo: PWidgetInfo); cdecl;