From 967f02d777dad7c0b6c9c5d66e96177ca5f1a41e Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Thu, 23 Feb 2012 17:24:04 +0000
Subject: [PATCH] Gtk2: fixed columns resizing by mouse. issue #21354

git-svn-id: trunk@35569 -
---
 lcl/interfaces/gtk2/gtk2callback.inc | 39 +++++++++++++++++++++++++---
 lcl/interfaces/gtk2/gtk2extrah.inc   |  3 +++
 lcl/interfaces/gtk2/gtk2proc.pp      |  2 +-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc
index 0e099ff0b7..ec0de533fb 100644
--- a/lcl/interfaces/gtk2/gtk2callback.inc
+++ b/lcl/interfaces/gtk2/gtk2callback.inc
@@ -1274,11 +1274,42 @@ end;
   Returns true, if mouse move event should be sent before the widget istelf
   reacts.
 -------------------------------------------------------------------------------}
-function ControlGetsMouseMoveBefore(AControl: TControl): boolean;
+function ControlGetsMouseMoveBefore(AControl: TControl;
+  const ABefore: Boolean; Event: PGDKEventMotion): boolean;
+var
+  ShiftState: TShiftState;
+  Widget: PGtkWidget;
+  MainView: PGtkWidget;
+  i: Integer;
 begin
   if (AControl=nil) then ;
   // currently there are no controls, that need after events.
-  Result:=true;
+  Result := True;
+
+  // gtk2 column resizing ... issue #21354
+  if (Event <> nil) and not (csDesigning in AControl.ComponentState) and
+    (AControl is TWinControl) and
+    (TWinControl(AControl).FCompStyle = csListView) and
+    (TListView(AControl).ViewStyle = vsReport) and
+    (TListView(AControl).ShowColumnHeaders) then
+  begin
+    ShiftState := GTKEventStateToShiftState(Event^.State);
+    if ssLeft in ShiftState then
+    begin
+      Widget := PGtkWidget(TWinControl(AControl).Handle);
+      if GTK_IS_SCROLLED_WINDOW(Widget) then
+      begin
+        MainView := gtk_bin_get_child(PGtkBin(Widget));
+        if GTK_IS_TREE_VIEW(MainView) then
+        begin
+          // here we are
+          if gtk_tree_view_get_bin_window(PGtkTreeView(MainView)) <> Event^.window then
+            Result := False;
+        end;
+      end;
+    end;
+  end;
+
 end;
 
 procedure GTKGetDevicePointer(win: PGdkWindow; dev: PGdkDevice;
@@ -1359,7 +1390,7 @@ begin
   begin
     DesignOnlySignal := GetDesignOnlySignalFlag(Widget, dstMouseMotion);
     if DesignOnlySignal then exit;
-    if not ControlGetsMouseMoveBefore(TControl(Data)) then exit;
+    if not ControlGetsMouseMoveBefore(TControl(Data), True, Event) then exit;
   end else
   begin
     // stop the signal, so that the widget does not auto react
@@ -1410,7 +1441,7 @@ begin
   UpdateMouseCaptureControl;
 
   if (csDesigning in TComponent(Data).ComponentState) then exit;
-  if ControlGetsMouseMoveBefore(TControl(Data)) then exit;
+  if ControlGetsMouseMoveBefore(TControl(Data), True, Event) then exit;
 
   DeliverMouseMoveMessage(Widget,Event, TWinControl(Data));
 end;
diff --git a/lcl/interfaces/gtk2/gtk2extrah.inc b/lcl/interfaces/gtk2/gtk2extrah.inc
index b8a090638e..0bff5226db 100644
--- a/lcl/interfaces/gtk2/gtk2extrah.inc
+++ b/lcl/interfaces/gtk2/gtk2extrah.inc
@@ -237,6 +237,9 @@ function gtk_icon_view_get_cursor(icon_view: PGtkIconView; var path: PGtkTreePat
 procedure gtk_icon_view_set_cursor(icon_view: PGtkIconView; path: PGtkTreePath; cell: PGtkCellRenderer; start_editing: gboolean); cdecl; external gtklib;
 function gtk_tree_view_get_visible_range(tree_view: PGtkTreeView; out start_path, endpath: PGtkTreePath): gboolean; cdecl; external gtklib;
 function gtk_icon_view_get_visible_range(tree_view: PGtkTreeView; out start_path, endpath: PGtkTreePath): gboolean; cdecl; external gtklib;
+
+procedure gtk_tree_view_column_queue_resize(tree_column: PGtkTreeViewColumn); cdecl; external gtklib;
+
 {$endif}
 {$ifdef GTK_2_10}
 function gdk_screen_is_composited(screen: PGdkScreen): gboolean; cdecl; external gdklib;
diff --git a/lcl/interfaces/gtk2/gtk2proc.pp b/lcl/interfaces/gtk2/gtk2proc.pp
index 0e8e893872..6b95d89674 100644
--- a/lcl/interfaces/gtk2/gtk2proc.pp
+++ b/lcl/interfaces/gtk2/gtk2proc.pp
@@ -140,7 +140,7 @@ function gtkresizeCB(widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
 function gtkMonthChanged(Widget: PGtkWidget; data: gPointer): GBoolean; cdecl;
 procedure DeliverMouseMoveMessage(Widget:PGTKWidget; Event: PGDKEventMotion;
                                   AWinControl: TWinControl);
-function ControlGetsMouseMoveBefore(AControl: TControl): boolean;
+
 function gtkMotionNotify(Widget:PGTKWidget; Event: PGDKEventMotion;
                          Data: gPointer): GBoolean; cdecl;
 function GTKMotionNotifyAfter(widget:PGTKWidget; event: PGDKEventMotion;