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

customdrawn: Fixes bug #21573 problems in TCDScrollBar slider mouse drag

Browse Source 
git-svn-id: trunk@52782 -
This commit is contained in:
sekelsenmat 2016-08-04 06:57:58 +00:00
parent fddf4ea109
commit b795a254dd
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lcl/customdrawncontrols.pas
View File

@ -396,6 +396,7 @@ type
private
FKind: TScrollBarKind;
procedure SetKind(AValue: TScrollBarKind);
procedure GetBorderSizes(out ALeft, ARight: Integer);
protected
function GetPositionFromMousePos(X, Y: Integer): integer; override;
function GetButtonFromMousePos(X, Y: Integer): TCDControlState; override;
@ -2372,7 +2373,7 @@ end;
function TCDPositionedControl.GetPositionDisplacementWithMargins(AOldMousePos,
ANewMousePos: TPoint; ALeftMargin, ARightMargin: Integer; AIsHorizontal: Boolean): Integer;
var
lCoord, lSize: Integer;
lCoord, lSize, lCurPos: Integer;
begin
if AIsHorizontal then
begin
@ -2385,12 +2386,12 @@ begin
lSize := Height;
end;
Result := FMin + (lCoord - ALeftMargin) * (FMax - FMin + 1) div (lSize - ARightMargin - ALeftMargin);
Result := FPositionAtMouseDown + Result;
Result := FMin + lCoord * (FMax - FMin + 1) div (lSize - ARightMargin - ALeftMargin);
lCurPos := Result + FPositionAtMouseDown;
// sanity check
if Result > FMax then Result := FMax;
if Result < FMin then Result := FMin;
if lCurPos > FMax then Result := FMax - FPositionAtMouseDown;
if lCurPos < FMin then Result := FMin - FPositionAtMouseDown;
end;
function TCDPositionedControl.GetButtonFromMousePos(X, Y: Integer): TCDControlState;
@ -2551,12 +2552,21 @@ begin
if not (csLoading in ComponentState) then Invalidate;
end;
procedure TCDScrollBar.GetBorderSizes(out ALeft, ARight: Integer);
begin
ALeft := FDrawer.GetMeasures(TCDSCROLLBAR_LEFT_SPACING) +
FDrawer.GetMeasures(TCDSCROLLBAR_LEFT_BUTTON_POS) +
FDrawer.GetMeasures(TCDSCROLLBAR_BUTTON_WIDTH);
ARight := FDrawer.GetMeasures(TCDSCROLLBAR_RIGHT_SPACING) +
FDrawer.GetMeasures(TCDSCROLLBAR_RIGHT_BUTTON_POS) +
FDrawer.GetMeasures(TCDSCROLLBAR_BUTTON_WIDTH);
end;
function TCDScrollBar.GetPositionFromMousePos(X, Y: Integer): integer;
var
lLeftBorder, lRightBorder: Integer;
begin
lLeftBorder := FDrawer.GetMeasures(TCDSCROLLBAR_LEFT_SPACING);
lRightBorder := FDrawer.GetMeasures(TCDSCROLLBAR_RIGHT_SPACING);
GetBorderSizes(lLeftBorder, lRightBorder);
Result := GetPositionFromMousePosWithMargins(X, Y, lLeftBorder, lRightBorder, FKind = sbHorizontal, False);
end;
@ -2592,8 +2602,7 @@ function TCDScrollBar.GetPositionDisplacement(AOldMousePos, ANewMousePos: TPoint
var
lLeftBorder, lRightBorder: Integer;
begin
lLeftBorder := FDrawer.GetMeasures(TCDSCROLLBAR_LEFT_SPACING);
lRightBorder := FDrawer.GetMeasures(TCDSCROLLBAR_RIGHT_SPACING);
GetBorderSizes(lLeftBorder, lRightBorder);
Result := GetPositionDisplacementWithMargins(AOldMousePos, ANewMousePos,
lLeftBorder, lRightBorder, FKind = sbHorizontal);

5
lcl/interfaces/lcl.lpk
View File

@ -113,6 +113,11 @@ end;"/>
<ValueDescriptions Count="2"/>
</Item2>
</BuildMacros>
<Linking>
<Debugging>
<DebugInfoType Value="dsDwarf2"/>
</Debugging>
</Linking>
<Other>
<CompilerMessages>
<IgnoredMessages idx5044="True"/>

5
lcl/lclbase.lpk
View File

@ -13,6 +13,11 @@
</SearchPaths>
<Conditionals Value="if SrcOS&lt;>'win' then
UnitPath := 'nonwin32';"/>
<Linking>
<Debugging>
<DebugInfoType Value="dsDwarf2"/>
</Debugging>
</Linking>
<Other>
<Verbosity>
<ShowNotes Value="False"/>