Skip to content

Commit

Permalink
Remove senders of scaledByDisplayScaleFactor and displayScaleFactor, …
Browse files Browse the repository at this point in the history
…superseeded by new scale factor support
  • Loading branch information
guillep committed Sep 27, 2024
1 parent b6c5366 commit 461753f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SpMorphicListAdapterTest >> testScrollToIndexVisibleScrollbars [
self configureList: 100.
presenter
open;
withWindowDo: [ : w | w resize: (200 @ 400) scaledByDisplayScaleFactor ].
withWindowDo: [ : w | w resize: (200 @ 400) ].
self
assert: presenter scrollIndex
equals: 1.
Expand Down
4 changes: 2 additions & 2 deletions src/Spec2-Adapters-Morphic/SpFontStyle.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ SpFontStyle >> calculateFontSize [
aVariable value ifNotNil: [
^ self scaledSize ] ].
self nameVariable isEnvironmentVariable ifTrue: [
^ self nameVariable pointSize * self displayScaleFactor ].
^ self nameVariable pointSize ].
self hasPredefinedFont ifTrue: [
^ self obtainPredefinedFont pointSize * self displayScaleFactor ].
^ self obtainPredefinedFont pointSize ].

^ nil
]
Expand Down
6 changes: 3 additions & 3 deletions src/Spec2-Adapters-Morphic/SpMorphicButtonBarAdapter.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ Class {
{ #category : 'accessing' }
SpMorphicButtonBarAdapter class >> defaultHeight [

^ 30 scaledByDisplayScaleFactor
^ 30
]

{ #category : 'accessing' }
SpMorphicButtonBarAdapter class >> defaultItemSeparation [

^ (3@0) scaledByDisplayScaleFactor
^ (3@0)
]

{ #category : 'factory' }
Expand All @@ -27,7 +27,7 @@ SpMorphicButtonBarAdapter >> addModelTo: panelMorph [
self model items do: [ :each |
self model focusOrder add: each.
panelMorph addMorph: (each build
width: 100 scaledByDisplayScaleFactor;
width: 100;
hResizing: #rigid;
yourself) ]
]
Expand Down
2 changes: 1 addition & 1 deletion src/Spec2-Adapters-Morphic/SpStyleVariable.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SpStyleVariable >> preferredValueWith: anObject [
{ #category : 'evaluating' }
SpStyleVariable >> scaledValue [

^ self nonscaledValue * self currentWorld displayScaleFactor
^ self nonscaledValue
]

{ #category : 'private' }
Expand Down

0 comments on commit 461753f

Please sign in to comment.