paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 19:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the Gtk 2 progress bar.

Browse Source 
git-svn-id: trunk@14806 -
This commit is contained in:
sekelsenmat 2008-04-12 01:35:00 +00:00
parent cf3c9916a4
commit 80966d6f64
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/gtk2/gtk2wscomctrls.pp
View File

@ -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;