From: <ah...@us...> - 2006-09-30 14:35:25
|
Revision: 10952 http://svn.sourceforge.net/jvcl/?rev=10952&view=rev Author: ahuser Date: 2006-09-30 07:35:17 -0700 (Sat, 30 Sep 2006) Log Message: ----------- Code cleanup Modified Paths: -------------- trunk/jvcl/run/JvComponentPanel.pas Modified: trunk/jvcl/run/JvComponentPanel.pas =================================================================== --- trunk/jvcl/run/JvComponentPanel.pas 2006-09-29 13:41:32 UTC (rev 10951) +++ trunk/jvcl/run/JvComponentPanel.pas 2006-09-30 14:35:17 UTC (rev 10952) @@ -45,7 +45,7 @@ {$IFDEF VisualCLX} Types, QTypes, {$ENDIF VisualCLX} - Classes, Buttons, + Classes, Controls, Buttons, JvButtons, JvExtComponent, JvExButtons; type @@ -140,9 +140,6 @@ implementation -uses - Controls; - {$R JvComponentPanel.res} constructor TJvComponentPanel.Create(AOwner: TComponent); @@ -251,7 +248,6 @@ Result := -1; end; - function TJvComponentPanel.GetButton(Index: Integer): TJvExSpeedButton; begin if (Index < 0) or (Index > FButtons.Count - 1) then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ah...@us...> - 2007-05-31 20:49:20
|
Revision: 11304 http://svn.sourceforge.net/jvcl/?rev=11304&view=rev Author: ahuser Date: 2007-05-31 13:49:19 -0700 (Thu, 31 May 2007) Log Message: ----------- Bugfix: Resizing the component caused a very time consuming but unnecessary realign of the SpeedButtons Modified Paths: -------------- trunk/jvcl/run/JvComponentPanel.pas Modified: trunk/jvcl/run/JvComponentPanel.pas =================================================================== --- trunk/jvcl/run/JvComponentPanel.pas 2007-05-30 16:57:05 UTC (rev 11303) +++ trunk/jvcl/run/JvComponentPanel.pas 2007-05-31 20:49:19 UTC (rev 11304) @@ -24,8 +24,6 @@ description: Component panel for GUI developers Known Issues: - Some russian comments were translated to english; these comments are marked - with [translated] -----------------------------------------------------------------------------} // $Id$ @@ -45,7 +43,7 @@ {$IFDEF VisualCLX} Types, QTypes, {$ENDIF VisualCLX} - Classes, Controls, Buttons, + Classes, Controls, Buttons, Forms, JvButtons, JvExtComponent, JvExButtons; type @@ -270,7 +268,6 @@ var TmpButton: TJvExSpeedButton; begin - // (rom) removed the exception and the limit of 100 buttons if AButtonCount < 0 then Exit; BeginUpdate; @@ -287,10 +284,10 @@ with TmpButton do begin Flat := True; - Parent := Self; Top := 0; GroupIndex := 1; HintWindowClass := Self.HintWindowClass; + Parent := Self; OnClick := BtnClick; OnDblClick := BtnDblClick; end; @@ -371,23 +368,27 @@ Height := FButtonHeight; if FButtonPointer = nil then Exit; // asn: for visualclx - FButtonPointer.Height := FButtonHeight; - FButtonPointer.Width := FButtonWidth; - FButtonLeft.Height := FButtonHeight; - FButtonRight.Height := FButtonHeight; - FButtonPointer.Left := 0; - FButtonLeft.Left := FButtonWidth + 6; - FButtonRight.Left := (FButtonWidth + 12 + 6) + VisibleCount * FButtonWidth; - FButtonLeft.Enabled := FFirstVisible > 0; - FButtonRight.Enabled := FButtons.Count > FFirstVisible + VisibleCount; - for I := 0 to FButtons.Count - 1 do - begin - TSpeedButton(FButtons[I]).Width := FButtonWidth; - TSpeedButton(FButtons[I]).Height := FButtonHeight; - if (I >= FFirstVisible) and (I < FFirstVisible + VisibleCount) then - TSpeedButton(FButtons[I]).Left := (FButtonWidth + 12 + 6) + (I - FFirstVisible) * FButtonWidth - else - TSpeedButton(FButtons[I]).Left := -100; + DisableAlign; + try + FButtonPointer.Height := FButtonHeight; + FButtonPointer.Width := FButtonWidth; + FButtonLeft.Height := FButtonHeight; + FButtonRight.Height := FButtonHeight; + FButtonPointer.Left := 0; + FButtonLeft.Left := FButtonWidth + 6; + FButtonRight.Left := (FButtonWidth + 12 + 6) + VisibleCount * FButtonWidth; + FButtonLeft.Enabled := FFirstVisible > 0; + FButtonRight.Enabled := FButtons.Count > FFirstVisible + VisibleCount; + for I := 0 to FButtons.Count - 1 do + begin + if (I >= FFirstVisible) and (I < FFirstVisible + VisibleCount) then + TSpeedButton(FButtons[I]).SetBounds((FButtonWidth + 12 + 6) + (I - FFirstVisible) * FButtonWidth, 0, FButtonWidth, FButtonHeight) + else + TSpeedButton(FButtons[I]).SetBounds(-100, 0, FButtonWidth, FButtonHeight); + end; + finally + ControlState := ControlState - [csAlignmentNeeded]; + EnableAlign; end; end; @@ -450,6 +451,7 @@ if FLockUpdate = 0 then begin Resize; + ControlState := ControlState - [csAlignmentNeeded]; EnableAlign; end; end; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |