Merge pull request #14464 from Rinzwind/uitheme-display-scale-factor

Make methods in the UITheme hierarchy take the display scale factor into account
pharo-project · Aug 14, 2023 · ebbd0c1 · ebbd0c1
2 parents 5499a7c + 54db257
commit ebbd0c1
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 78 deletions.
diff --git a/src/Morphic-Widgets-Taskbar/UITheme.extension.st b/src/Morphic-Widgets-Taskbar/UITheme.extension.st
@@ -16,7 +16,7 @@ UITheme >> newBasicTaskbarButtonIn: aTaskbar for: aMorph [
 		newRowIn: aTaskbar
 		for: {((self iconNamed: aMorph taskbarIconName) ifNil: [^nil]) asMorph. lab}.
 
-	lm cellInset: 2.
+	lm cellInset: 2 scaledByDisplayScaleFactor.
 
 	button := self
 		newButtonIn: aTaskbar

diff --git a/src/Polymorph-Widgets/PharoDarkTheme.class.st b/src/Polymorph-Widgets/PharoDarkTheme.class.st
@@ -47,7 +47,7 @@ PharoDarkTheme >> buttonNormalBorderStyleFor: aButton [
 			  width: 0;
 			  baseColor: Color transparent ].
 	^ SimpleBorderStyle new
-		  width: 1;
+		  width: 1 scaledByDisplayScaleFactor;
 		  baseColor: self buttonColor
 ]
 
@@ -76,7 +76,7 @@ PharoDarkTheme >> configureWindowBorderFor: aWindow [
 	| aStyle |
 	aStyle := SimpleBorderStyle new
 		          color: self borderColor;
-		          width: 1.
+		          width: 1 scaledByDisplayScaleFactor.
 	aWindow borderStyle: aStyle
 ]
 
@@ -95,7 +95,7 @@ PharoDarkTheme >> dropListNormalListBorderStyleFor: aDropList [
 	"Return the normal borderStyle for the list of the given given drop list"
 
 	^ BorderStyle inset
-		  width: 1;
+		  width: 1 scaledByDisplayScaleFactor;
 		  baseColor: self buttonColor
 ]
 
@@ -152,7 +152,7 @@ PharoDarkTheme >> taskbarItemMouseOverBorderStyleFor: aButton [
 
 	^ BottomBorderStyle new
 		  color: Color white;
-		  width: 2;
+		  width: 2 scaledByDisplayScaleFactor;
 		  yourself
 ]
 
@@ -167,8 +167,8 @@ PharoDarkTheme >> taskbarItemNormalBorderStyleFor: aButton [
 
 	^ BottomBorderStyle new
 		  color: Color white;
-		  width: 1;
-		  trimSize: 2;
+		  width: 1 scaledByDisplayScaleFactor;
+		  trimSize: 2 scaledByDisplayScaleFactor;
 		  yourself
 ]
 

diff --git a/src/Polymorph-Widgets/PharoLightTheme.class.st b/src/Polymorph-Widgets/PharoLightTheme.class.st
@@ -40,7 +40,7 @@ PharoLightTheme >> buttonNormalBorderStyleFor: aButton [
 							baseColor: Color transparent ].
 	outerColor := self darkBaseColorFor: aButton.
 	^ SimpleBorderStyle new
-			width: 1;
+			width: 1 scaledByDisplayScaleFactor;
 			baseColor: outerColor
 ]
 
@@ -50,7 +50,7 @@ PharoLightTheme >> configureWindowBorderFor: aWindow [
 	| aStyle |
 	aStyle := SimpleBorderStyle new
 					color: (Color lightGray);
-					width: 1.
+					width: 1 scaledByDisplayScaleFactor.
 	aWindow borderStyle: aStyle
 ]
 
@@ -93,7 +93,7 @@ PharoLightTheme >> taskbarItemDisabledFillStyleFor: aButton [
 PharoLightTheme >> taskbarItemMouseOverBorderStyleFor: aButton [
 	^ BottomBorderStyle new
 		color: (Color fromHexString: '616161');
-		width: 2;
+		width: 2 scaledByDisplayScaleFactor;
 		yourself
 ]
 
@@ -106,8 +106,8 @@ PharoLightTheme >> taskbarItemMouseOverFillStyleFor: aButton [
 PharoLightTheme >> taskbarItemNormalBorderStyleFor: aButton [
 	^ BottomBorderStyle new
 		color: (Color fromHexString: '757575');
-		width: 2;
-		trimSize: 2;
+		width: 2 scaledByDisplayScaleFactor;
+		trimSize: 2 scaledByDisplayScaleFactor;
 		yourself
 ]