paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-04 04:37:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a crash in the TCDTrackBar when Max-Min >= Width and renamed some variables to better names

Browse Source 
git-svn-id: trunk@32509 -
This commit is contained in:
sekelsenmat 2011-09-25 12:18:15 +00:00
parent a9beff6a99
commit 3de2864e7e
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/customdrawn/customdrawn.lpk
View File

@ -1,15 +1,25 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="3">
<Package Version="4">
<PathDelim Value="\"/>
<Name Value="customdrawn"/>
<AddToProjectUsesSection Value="True"/>
<CompilerOptions>
<Version Value="9"/>
<Version Value="10"/>
<PathDelim Value="\"/>
<SearchPaths>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
<Debugging>
<GenerateDebugInfo Value="True"/>
<GenerateDwarf Value="True"/>
</Debugging>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>

26
components/customdrawn/customdrawnextras.pas
View File

@ -1875,7 +1875,7 @@ begin
Width := 100;
FCurrentDrawer := TCDTrackBarDrawerGraph.Create;
Color := clBtnFace;
FMax := 100;
FMax := 10;
FMin := 0;
TabStop := True;
FFromColor := clWhite;
@ -1947,19 +1947,25 @@ end;
procedure TCDTrackBarDrawerGraph.DrawToIntfImage(ADest: TFPImageCanvas;
FPImg: TLazIntfImage; CDTrackBar: TCDTrackBar; FromColor, ToColor: TColor;
pWidth: integer);
const CDBarEdge = 16;
const
CDBarEdge = 16;
var
aStart, RNum, i, pStart, pEnd, pDelta: integer;
aStart, StepsCount, i, pStart, pEnd, pDelta: integer;
dRect: TRect;
TempB: TLazIntfImage;
BCanvas: TFPImageCanvas;
ABmp: TBitmap = nil;
pStepWidth: Double;
begin
if CDTrackBar.Max - CDTrackBar.Min <= 0 then
Exit;
RNum := CDTrackBar.Max - CDTrackBar.Min + 1;
StepsCount := CDTrackBar.Max - CDTrackBar.Min + 1;
if CDTrackBar.AutoWidth then
pWidth := (CDTrackBar.Width - CDBarEdge) div RNum;
pStepWidth := (CDTrackBar.Width - CDBarEdge) / StepsCount
else
pStepWidth := Round(pWidth);
if pWidth <= 0 then pWidth := 1;
// Background
if CDTrackBar.Parent = nil then
ADest.Brush.FPColor := colLtGray
@ -1997,6 +2003,7 @@ begin
ABmp := TBitmap.Create;
ABmp.Width := CDTrackBar.Width;
ABmp.Height := CDTrackBar.Height;
TempB := ABmp.CreateIntfImage;
//TempB := TLazIntfImage.Create(0, 0);
//TempB.UsePalette := False;
@ -2008,9 +2015,10 @@ begin
//GradHFill(BCanvas, Rect(0, 0, CDTrackBar.Width, CDTrackBar.Height),
// GetAColor(FromColor, 70 + i), GetAColor(ToColor, 90 + i));
GradCenterFill(BCanvas, Rect(0, 0, CDTrackBar.Width, CDTrackBar.Height),
FromColor, ToColor, CDTrackBar.Position / RNum);
FromColor, ToColor, CDTrackBar.Position / StepsCount);
pStart := 10 - 1;
for i := 0 to RNum - 1 do
for i := 0 to StepsCount - 1 do
begin
ADest.Brush.Style := bsSolid;
// GradHFill(ADest, dRect, GetAColor(FromColor, 70 + i), GetAColor(ToColor, 90 + i));
@ -2020,11 +2028,11 @@ begin
pDelta := CDTrackBar.Width - (10 + i * pWidth + pWidth - 3) - 11
else
pDelta := 0; }
if i > RNum - (CDTrackBar.Width - CDBarEdge) mod pWidth then
if i > StepsCount - (CDTrackBar.Width - CDBarEdge) mod pWidth then
pDelta := 1
else
pDelta := 0;
pEnd := pStart + pWidth - 3 + pDelta;
pEnd := pStart + Round(pStepWidth) - 3 + pDelta;
dRect := Rect(pStart, aStart - 5 - i, pEnd, aStart - 1);
//FPImgCloneRect(TempB, FPImg, Rect(10 + i * pWidth, aStart - 5 -
// i, 10 + i * pWidth + pWidth - 3 + pDelta, aStart - 1), False);