From a01d03568c58f92f2f664567e3608d731eaa417c Mon Sep 17 00:00:00 2001 From: Kris <1611248+Rinzwind@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:31:14 +0200 Subject: [PATCH] =?UTF-8?q?Applied=20changes=20from=20pull=20request=20#13?= =?UTF-8?q?848=20(=E2=80=9CFix=20System=20Browser=20scaling=E2=80=9D)=20to?= =?UTF-8?q?=20Pharo=2011.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Calypso-Browser/ClyBrowserMorph.class.st | 2 +- src/Calypso-Browser/ClyNotebookPageActionButtonMorph.class.st | 2 +- src/Calypso-Browser/ClyNotebookPageMorph.class.st | 2 +- src/Calypso-Browser/ClyToolbarMorph.class.st | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Calypso-Browser/ClyBrowserMorph.class.st b/src/Calypso-Browser/ClyBrowserMorph.class.st index 5ad3f0e4826..21a3d99cf0e 100644 --- a/src/Calypso-Browser/ClyBrowserMorph.class.st +++ b/src/Calypso-Browser/ClyBrowserMorph.class.st @@ -348,7 +348,7 @@ ClyBrowserMorph >> ignoreNavigationDuring: aBlock [ { #category : #initialization } ClyBrowserMorph >> initialExtent [ - ^ 850@620 + ^ 850@620 * self currentWorld displayScaleFactor ] { #category : #initialization } diff --git a/src/Calypso-Browser/ClyNotebookPageActionButtonMorph.class.st b/src/Calypso-Browser/ClyNotebookPageActionButtonMorph.class.st index 360419d6ff6..34269c94c98 100644 --- a/src/Calypso-Browser/ClyNotebookPageActionButtonMorph.class.st +++ b/src/Calypso-Browser/ClyNotebookPageActionButtonMorph.class.st @@ -52,7 +52,7 @@ ClyNotebookPageActionButtonMorph >> forAction: anAction [ passiveEnabledOverDownFillStyle: (self theme buttonPressedFillStyleFor: self); addUpAction: [ anAction action value ]; setBalloonText: anAction label; - extent: 16@16. + extent: 16@16 * self currentWorld displayScaleFactor. icon := anAction icon. diff --git a/src/Calypso-Browser/ClyNotebookPageMorph.class.st b/src/Calypso-Browser/ClyNotebookPageMorph.class.st index 8a2206b0d58..311f803e6b3 100644 --- a/src/Calypso-Browser/ClyNotebookPageMorph.class.st +++ b/src/Calypso-Browser/ClyNotebookPageMorph.class.st @@ -79,7 +79,7 @@ ClyNotebookPageMorph >> initialize [ But this is not good, think a better way." labelMorph := labelPresenter build hResizing: #rigid; - width: 120; + width: 120 * self currentWorld displayScaleFactor; yourself ] diff --git a/src/Calypso-Browser/ClyToolbarMorph.class.st b/src/Calypso-Browser/ClyToolbarMorph.class.st index d35812aa5da..ee0c07fba0c 100644 --- a/src/Calypso-Browser/ClyToolbarMorph.class.st +++ b/src/Calypso-Browser/ClyToolbarMorph.class.st @@ -61,7 +61,7 @@ ClyToolbarMorph >> browser: anObject [ { #category : #initialization } ClyToolbarMorph >> defaultHeight [ - ^30 + ^ 30 * self currentWorld displayScaleFactor ] { #category : #initialization }