diff --git a/src/Spec2-Adapters-Morphic-Tests/SpMorphicListAdapterTest.class.st b/src/Spec2-Adapters-Morphic-Tests/SpMorphicListAdapterTest.class.st index 5f5eb6ab..75eac385 100644 --- a/src/Spec2-Adapters-Morphic-Tests/SpMorphicListAdapterTest.class.st +++ b/src/Spec2-Adapters-Morphic-Tests/SpMorphicListAdapterTest.class.st @@ -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. diff --git a/src/Spec2-Adapters-Morphic/SpFontStyle.class.st b/src/Spec2-Adapters-Morphic/SpFontStyle.class.st index cfa8e1c9..d08713b4 100644 --- a/src/Spec2-Adapters-Morphic/SpFontStyle.class.st +++ b/src/Spec2-Adapters-Morphic/SpFontStyle.class.st @@ -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 ] diff --git a/src/Spec2-Adapters-Morphic/SpMorphicButtonBarAdapter.class.st b/src/Spec2-Adapters-Morphic/SpMorphicButtonBarAdapter.class.st index 9d1d86e9..d1bc23b9 100644 --- a/src/Spec2-Adapters-Morphic/SpMorphicButtonBarAdapter.class.st +++ b/src/Spec2-Adapters-Morphic/SpMorphicButtonBarAdapter.class.st @@ -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' } @@ -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) ] ] diff --git a/src/Spec2-Adapters-Morphic/SpStyleVariable.class.st b/src/Spec2-Adapters-Morphic/SpStyleVariable.class.st index 665bdcf4..baaa6beb 100644 --- a/src/Spec2-Adapters-Morphic/SpStyleVariable.class.st +++ b/src/Spec2-Adapters-Morphic/SpStyleVariable.class.st @@ -52,7 +52,7 @@ SpStyleVariable >> preferredValueWith: anObject [ { #category : 'evaluating' } SpStyleVariable >> scaledValue [ - ^ self nonscaledValue * self currentWorld displayScaleFactor + ^ self nonscaledValue ] { #category : 'private' }