From 80966d6f64a2fecfe23f1fa7589d87ed0c0f88fa Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Sat, 12 Apr 2008 01:35:00 +0000
Subject: [PATCH] Fixes the Gtk 2 progress bar.

git-svn-id: trunk@14806 -
---
 lcl/interfaces/gtk2/gtk2wscomctrls.pp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lcl/interfaces/gtk2/gtk2wscomctrls.pp b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
index 63efbcd685..41b09e2300 100644
--- a/lcl/interfaces/gtk2/gtk2wscomctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
@@ -300,12 +300,16 @@ class function TGtk2WSProgressBar.CreateHandle(const AWinControl: TWinControl;
 var
   Widget: PGtkWidget;
   WidgetInfo: PWidgetInfo;
+  AProgressBar: TCustomProgressBar;
 begin
+  AProgressBar := TCustomProgressBar(AWinControl);
   Widget := gtk_progress_bar_new;
   Result := TLCLIntfHandle(PtrUInt(Widget));
   WidgetInfo := CreateWidgetInfo(Pointer(Result), AWinControl, AParams);
   Set_RC_Name(AWinControl, Widget);
 
+  SetPosition(AProgressBar, AProgressBar.Position);
+
   TGtkWSWinControl.SetCallbacks(PGtkObject(Widget), TComponent(WidgetInfo^.LCLObject));
 end;
 
@@ -332,14 +336,23 @@ begin
 
     UpdateProgressBarText(AProgressBar);
   end;
+
+  // The posision also needs to be updated at ApplyChanges
+  SetPosition(AProgressBar, AProgressBar.Position);
 end;
 
 class procedure TGtk2WSProgressBar.SetPosition(
   const AProgressBar: TCustomProgressBar; const NewPosition: integer);
 begin
-  with AProgressBar do
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(Pointer(Handle)),
-            (AProgressBar.Position+Abs(Min)) / (Max+Abs(Min)));
+  // Gtk2 wishes the position in a floating-point value between
+  // 0.0 and 1.0, and we calculate that with:
+  // (Pos - Min) / (Max - Min)
+  // regardless if any of them is negative the result is correct
+  gtk_progress_bar_set_fraction(
+    GTK_PROGRESS_BAR(Pointer(AProgressBar.Handle)),
+    (NewPosition - AProgressBar.Min) /
+    (AProgressBar.Max - AProgressBar.Min));
+
   if AProgressBar.BarShowText then
       UpdateProgressBarText(AProgressBar);
 end;