From: <ob...@us...> - 2006-12-12 15:59:07
|
Revision: 11078 http://svn.sourceforge.net/jvcl/?rev=11078&view=rev Author: obones Date: 2006-12-12 07:59:06 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Take Margins into account Modified Paths: -------------- trunk/jvcl/run/JvSimIndicator.pas Modified: trunk/jvcl/run/JvSimIndicator.pas =================================================================== --- trunk/jvcl/run/JvSimIndicator.pas 2006-12-12 13:40:55 UTC (rev 11077) +++ trunk/jvcl/run/JvSimIndicator.pas 2006-12-12 15:59:06 UTC (rev 11078) @@ -129,8 +129,13 @@ Canvas.Brush.Color := clSilver; Canvas.FillRect(R); Frame3D(Canvas, R, clBtnHighlight, clBtnShadow, 1); - InflateRect(R, -3, -3); + + Dec(R.Top, Margins.Top); + Dec(R.Left, Margins.Left); + Dec(R.Bottom, Margins.Bottom); + Dec(R.Right, Margins.Right); Frame3D(Canvas, R, clBtnShadow, clBtnHighlight, 1); + Canvas.Brush.Color := FBackColor; InflateRect(R, -1, -1); Canvas.FillRect(R); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ob...@us...> - 2006-12-12 19:24:56
|
Revision: 11080 http://svn.sourceforge.net/jvcl/?rev=11080&view=rev Author: obones Date: 2006-12-12 11:24:53 -0800 (Tue, 12 Dec 2006) Log Message: ----------- Pre D7 compatibility. Modified Paths: -------------- trunk/jvcl/run/JvSimIndicator.pas Modified: trunk/jvcl/run/JvSimIndicator.pas =================================================================== --- trunk/jvcl/run/JvSimIndicator.pas 2006-12-12 15:59:43 UTC (rev 11079) +++ trunk/jvcl/run/JvSimIndicator.pas 2006-12-12 19:24:53 UTC (rev 11080) @@ -34,7 +34,7 @@ JclUnitVersioning, {$ENDIF UNITVERSIONING} SysUtils, Classes, Windows, Graphics, Controls, ExtCtrls, - JvComponent; + JvComponent, JvJVCLUtils; type TJvSimIndicator = class(TJvGraphicControl) @@ -44,13 +44,20 @@ FMinimum: Integer; FBarColor: TColor; FBackColor: TColor; + {$IFNDEF COMPILER7_UP} + FMargins: TJvRect; + {$ENDIF !COMPILER7_UP} procedure SetBarColor(const Value: TColor); procedure SetMaximum(const Value: Integer); procedure SetMinimum(const Value: Integer); procedure SetValue(const Value: Integer); procedure SetBackColor(const Value: TColor); + {$IFNDEF COMPILER7_UP} + procedure SetMargins(const Value: TJvRect); + {$ENDIF !COMPILER7_UP} public constructor Create(AOwner: TComponent); override; + destructor Destroy; override; procedure Paint; override; published property Value: Integer read FValue write SetValue; @@ -60,6 +67,10 @@ property BackColor: TColor read FBackColor write SetBackColor default clSilver; property Width default 25; property Height default 100; + {$IFNDEF COMPILER7_UP} + property Margins: TJvRect read FMargins write SetMargins; + {$ENDIF !COMPILER7_UP} + property Align; property Anchors; @@ -108,6 +119,7 @@ constructor TJvSimIndicator.Create(AOwner: TComponent); begin inherited Create(AOwner); + Width := 25; Height := 100; FMinimum := 0; @@ -115,8 +127,21 @@ FValue := 50; FBarColor := clLime; FBackColor := clSilver; + + {$IFNDEF COMPILER7_UP} + FMargins := TJvRect.Create; + {$ENDIF !COMPILER7_UP} end; +destructor TJvSimIndicator.Destroy; +begin + {$IFNDEF COMPILER7_UP} + FMargins.Free; + {$ENDIF !COMPILER7_UP} + + inherited Destroy; +end; + procedure TJvSimIndicator.Paint; const NumberOfBars = 20; @@ -198,6 +223,14 @@ end; end; +{$IFNDEF COMPILER7_UP} +procedure TJvSimIndicator.SetMargins(const Value: TJvRect); +begin + FMargins.Assign(Value); + Invalidate; +end; +{$ENDIF !COMPILER7_UP} + {$IFDEF UNITVERSIONING} initialization RegisterUnitVersion(HInstance, UnitVersioning); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2006-12-16 23:02:48
|
Revision: 11093 http://svn.sourceforge.net/jvcl/?rev=11093&view=rev Author: ahuser Date: 2006-12-16 15:02:47 -0800 (Sat, 16 Dec 2006) Log Message: ----------- Fixed: Margins are introduced in Delphi 2006 and not Delphi 2005. Modified Paths: -------------- trunk/jvcl/run/JvSimIndicator.pas Modified: trunk/jvcl/run/JvSimIndicator.pas =================================================================== --- trunk/jvcl/run/JvSimIndicator.pas 2006-12-16 22:56:02 UTC (rev 11092) +++ trunk/jvcl/run/JvSimIndicator.pas 2006-12-16 23:02:47 UTC (rev 11093) @@ -44,17 +44,17 @@ FMinimum: Integer; FBarColor: TColor; FBackColor: TColor; - {$IFNDEF COMPILER7_UP} + {$IFNDEF COMPILER10_UP} FMargins: TJvRect; - {$ENDIF !COMPILER7_UP} + {$ENDIF !COMPILER10_UP} procedure SetBarColor(const Value: TColor); procedure SetMaximum(const Value: Integer); procedure SetMinimum(const Value: Integer); procedure SetValue(const Value: Integer); procedure SetBackColor(const Value: TColor); - {$IFNDEF COMPILER7_UP} + {$IFNDEF COMPILER10_UP} procedure SetMargins(const Value: TJvRect); - {$ENDIF !COMPILER7_UP} + {$ENDIF !COMPILER10_UP} public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -67,10 +67,9 @@ property BackColor: TColor read FBackColor write SetBackColor default clSilver; property Width default 25; property Height default 100; - {$IFNDEF COMPILER7_UP} + {$IFNDEF COMPILER10_UP} property Margins: TJvRect read FMargins write SetMargins; - {$ENDIF !COMPILER7_UP} - + {$ENDIF !COMPILER10_UP} property Align; property Anchors; @@ -128,16 +127,16 @@ FBarColor := clLime; FBackColor := clSilver; - {$IFNDEF COMPILER7_UP} + {$IFNDEF COMPILER10_UP} FMargins := TJvRect.Create; - {$ENDIF !COMPILER7_UP} + {$ENDIF !COMPILER10_UP} end; destructor TJvSimIndicator.Destroy; begin - {$IFNDEF COMPILER7_UP} + {$IFNDEF COMPILER10_UP} FMargins.Free; - {$ENDIF !COMPILER7_UP} + {$ENDIF !COMPILER10_UP} inherited Destroy; end; @@ -223,13 +222,13 @@ end; end; -{$IFNDEF COMPILER7_UP} +{$IFNDEF COMPILER10_UP} procedure TJvSimIndicator.SetMargins(const Value: TJvRect); begin FMargins.Assign(Value); Invalidate; end; -{$ENDIF !COMPILER7_UP} +{$ENDIF !COMPILER10_UP} {$IFDEF UNITVERSIONING} initialization This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |