Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5779 - Setting Display Scale Factor Changing #5889

Merged
merged 3 commits into from Mar 15, 2020
Merged

5779 - Setting Display Scale Factor Changing #5889

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb6f08b
An if clause is used to return if it's not dragging the slider. MacOS…
David5i6 Mar 13, 2020
36c54bf
Added dragging variable, and accessors (getter and setter) to reflect…
David5i6 Mar 13, 2020
ff393ef
Code revision and documentation.
David5i6 Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 34 additions & 14 deletions src/Morphic-Widgets-Scrolling/Slider.class.st
View file
Open in desktop
Expand Up @@ -7,7 +7,8 @@ Class {
'setValueSelector',
'sliderShadow',
'sliderColor',
'descending'
'descending',
'dragging'
],
#category : #'Morphic-Widgets-Scrolling'
}
Expand Down Expand Up @@ -64,6 +65,16 @@ Slider >> descending: aBoolean [
self value: value
]

{ #category : #access }
Slider >> dragging [
^ dragging.
]

{ #category : #access }
Slider >> dragging: aBoolean [
dragging := aBoolean.
]

{ #category : #geometry }
Slider >> extent: newExtent [
newExtent = bounds extent ifTrue: [^ self].
Expand All @@ -80,6 +91,7 @@ Slider >> initialize [
super initialize.
value := 0.0.
descending := false.
dragging := false.
self initializeSlider
]

Expand Down Expand Up @@ -110,19 +122,20 @@ Slider >> initializeSlider [
Slider >> mouseDownInSlider: event [

slider borderStyle style == #raised
ifTrue: [slider borderColor: #inset].
ifTrue: [slider borderColor: #inset. self dragging: true].
guillep marked this conversation as resolved.
Show resolved Hide resolved

sliderShadow color: self sliderShadowColor.
sliderShadow cornerStyle: slider cornerStyle.
sliderShadow bounds: slider bounds.
sliderShadow show
sliderShadow show.

]

{ #category : #'other events' }
Slider >> mouseUpInSlider: event [

slider borderStyle style == #inset
ifTrue: [slider borderColor: #raised].
ifTrue: [slider borderColor: #raised. self dragging: false].
guillep marked this conversation as resolved.
Show resolved Hide resolved

sliderShadow hide
]
Expand All @@ -140,20 +153,27 @@ Slider >> roomToMove [
{ #category : #scrolling }
Slider >> scrollAbsolute: event [
| r p |
"If I'm not dragging I will do nothing."
self dragging ifFalse: [ ^ self ].

r := self roomToMove.
bounds isWide
ifTrue: [r width = 0 ifTrue: [^ self]]
ifFalse: [r height = 0 ifTrue: [^ self]].
ifTrue: [ r width = 0
ifTrue: [ ^ self ] ]
ifFalse: [ r height = 0
ifTrue: [ ^ self ] ].
p := event targetPoint adhereTo: r.
self descending
ifFalse:
[self setValue: (bounds isWide
ifTrue: [(p x - r left) asFloat / r width]
ifFalse: [(p y - r top) asFloat / r height])]
ifTrue:
[self setValue: (bounds isWide
ifTrue: [(r right - p x) asFloat / r width]
ifFalse: [(r bottom - p y) asFloat / r height])]
ifFalse: [ self
setValue:
(bounds isWide
ifTrue: [ (p x - r left) asFloat / r width ]
ifFalse: [ (p y - r top) asFloat / r height ]) ]
ifTrue: [ self
setValue:
(bounds isWide
ifTrue: [ (r right - p x) asFloat / r width ]
ifFalse: [ (r bottom - p y) asFloat / r height ]) ]
]

{ #category : #initialization }
Expand Down