From 21dff33608af41553b78788a01a34a52043c8aef Mon Sep 17 00:00:00 2001 From: zeljko Date: Tue, 12 Jan 2010 09:50:55 +0000 Subject: [PATCH] Qt: do not animate progress bar during design time if pbstMarquee progress bar style enabled. git-svn-id: trunk@23426 - --- lcl/interfaces/qt/qtwscomctrls.pp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lcl/interfaces/qt/qtwscomctrls.pp b/lcl/interfaces/qt/qtwscomctrls.pp index 2d9fdce274..d76349fa4d 100644 --- a/lcl/interfaces/qt/qtwscomctrls.pp +++ b/lcl/interfaces/qt/qtwscomctrls.pp @@ -162,7 +162,8 @@ type TQtWSProgressBar = class(TWSProgressBar) protected - class procedure SetRangeStyle(AProgressBar: TQtProgressBar; AStyle: TProgressBarStyle; AMin, AMax: Integer); + class procedure SetRangeStyle(AProgressBar: TQtProgressBar; + AStyle: TProgressBarStyle; AMin, AMax: Integer; const AIsDesign: Boolean); published class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override; class procedure ApplyChanges(const AProgressBar: TCustomProgressBar); override; @@ -385,7 +386,7 @@ end; { TQtWSProgressBar } class procedure TQtWSProgressBar.SetRangeStyle(AProgressBar: TQtProgressBar; - AStyle: TProgressBarStyle; AMin, AMax: Integer); + AStyle: TProgressBarStyle; AMin, AMax: Integer; const AIsDesign: Boolean); begin if AStyle = pbstNormal then begin @@ -395,7 +396,7 @@ begin AProgressBar.setRange(AMin, AMax) end else - AProgressBar.setRange(0, 0); + AProgressBar.setRange(0, Integer(AIsDesign)); end; class function TQtWSProgressBar.CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; @@ -441,7 +442,9 @@ begin QtProgressBar.setTextVisible(AProgressBar.BarShowText); // The position, minumum and maximum values - SetRangeStyle(QtProgressBar, AProgressBar.Style, AProgressBar.Min, AProgressBar.Max); + SetRangeStyle(QtProgressBar, AProgressBar.Style, + AProgressBar.Min, AProgressBar.Max, + csDesigning in AProgressBar.ComponentState); QtProgressBar.setValue(AProgressBar.Position); end; @@ -459,7 +462,8 @@ begin Exit; QProgressBar := TQtProgressBar(AProgressBar.Handle); QProgressBar.reset; - SetRangeStyle(QProgressBar, NewStyle, AProgressBar.Min, AProgressBar.Max); + SetRangeStyle(QProgressBar, NewStyle, AProgressBar.Min, AProgressBar.Max, + csDesigning in AProgressBar.ComponentState); if NewStyle = pbstNormal then QProgressBar.setValue(AProgressBar.Position); end;