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

cocoa: removing NSSlider extra keyboard handling towards using altIncrementalValue

Browse Source 
git-svn-id: trunk@63190 -
This commit is contained in:
dmitry 2020-05-21 04:50:02 +00:00
parent 1c83511c19
commit 2fe9deebad
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/interfaces/cocoa/cocoaprivate.pas
View File

@ -327,8 +327,6 @@ type
procedure lclClearCallback; override; procedure lclClearCallback; override;
procedure resetCursorRects; override; procedure resetCursorRects; override;
// //
procedure keyDown(event: NSEvent); override;
//
procedure SnapToInteger(AExtraFactor: Integer = 0); message 'SnapToInteger:'; procedure SnapToInteger(AExtraFactor: Integer = 0); message 'SnapToInteger:';
procedure sliderAction(sender: id); message 'sliderAction:'; procedure sliderAction(sender: id); message 'sliderAction:';
// mouse // mouse
@ -1432,22 +1430,6 @@ begin
inherited resetCursorRects; inherited resetCursorRects;
end; end;
procedure TCocoaSlider.keyDown(event: NSEvent);
var
KeyCode: word;
begin
KeyCode := Event.keyCode;
case KeyCode of
kVK_UpArrow : SnapToInteger(1);
kVK_DownArrow : SnapToInteger(-1);
kVK_LeftArrow : SnapToInteger(-1);
kVK_RightArrow : SnapToInteger(1);
else
// If this isn't done callback.KeyEvent will cause arrow left/right to change control
inherited keyDown(event);
end;
end;
procedure TCocoaSlider.SnapToInteger(AExtraFactor: Integer); procedure TCocoaSlider.SnapToInteger(AExtraFactor: Integer);
begin begin
setIntValue(Round(doubleValue() + AExtraFactor)); setIntValue(Round(doubleValue() + AExtraFactor));

4
lcl/interfaces/cocoa/cocoawscomctrls.pas
View File

@ -2064,6 +2064,8 @@ begin
lSlider.setMinValue(ATrackBar.Min); lSlider.setMinValue(ATrackBar.Min);
lSlider.setIntValue(ATrackBar.Position); lSlider.setIntValue(ATrackBar.Position);
lSlider.intval := ATrackBar.Position; lSlider.intval := ATrackBar.Position;
lSlider.setContinuous(true);
lSlider.setAltIncrementValue(1); // forcing the slider to switch by 1 by the keyboard
// Ticks // Ticks
if ATrackBar.TickStyle = tsAuto then if ATrackBar.TickStyle = tsAuto then
@ -2097,8 +2099,6 @@ begin
lSlider.lclSetManTickDraw(ATrackBar.TickStyle = tsManual); lSlider.lclSetManTickDraw(ATrackBar.TickStyle = tsManual);
//for some reason Option(Alt)+Drag doesn't work at all
//lSlider.setAltIncrementValue(ATrackBar.PageSize);
lSlider.setNumberOfTickMarks(lTickCount); lSlider.setNumberOfTickMarks(lTickCount);
if ATrackBar.TickMarks = tmTopLeft then if ATrackBar.TickMarks = tmTopLeft then