Same with menuSelectionColor

pharo-project · Aug 13, 2019 · 67b4696 · 67b4696
1 parent 5f8a64a
commit 67b4696
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/src/Morphic-Base/HaloMorph.class.st b/src/Morphic-Base/HaloMorph.class.st
@@ -963,13 +963,10 @@ HaloMorph >> handlerForBlueButtonDown: anEvent [
 
 { #category : #initialization }
 HaloMorph >> initialize [
-	"initialize the state of the receiver"
 	super initialize.
 
 	growingOrRotating := false.
-	self borderStyle: (SimpleBorder
-		width: 2
-		color: self theme settings menuSelectionColor)
+	self borderStyle: (SimpleBorder width: 2 color: self theme menuSelectionColor)
 ]
 
 { #category : #accessing }

diff --git a/src/Morphic-Base/MenuItemMorph.class.st b/src/Morphic-Base/MenuItemMorph.class.st
@@ -625,9 +625,9 @@ MenuItemMorph >> select: evt [
 MenuItemMorph >> selectionFillStyle [
 	"answer the fill style to use with the receiver is the selected  
 	element"
-	Display depth <= 2 ifTrue: [^ Color gray].
-	^ self theme settings menuSelectionColor.
 
+	Display depth <= 2 ifTrue: [ ^ Color gray ].
+	^ self theme menuSelectionColor
 ]
 
 { #category : #private }

diff --git a/src/Morphic-Base/SelectionMorph.class.st b/src/Morphic-Base/SelectionMorph.class.st
@@ -240,8 +240,8 @@ SelectionMorph >> defaultBorderColor [
 { #category : #initialization }
 SelectionMorph >> defaultColor [
 	"answer the default color/fill style for the receiver"
-	^ (self theme settings menuSelectionColor) alpha: 0.08
 
+	^ self theme menuSelectionColor alpha: 0.08
 ]
 
 { #category : #'submorphs-add/remove' }

diff --git a/src/Morphic-Widgets-Pluggable/PluggableListMorph.class.st b/src/Morphic-Widgets-Pluggable/PluggableListMorph.class.st
@@ -1347,7 +1347,7 @@ PluggableListMorph >> selectionColor: aColor [
 PluggableListMorph >> selectionColorToUse [
 	"Answer the colour to use for selected items."
 
-	^ selectionColorToUse ifNil: [self theme settings selectionColor] 
+	^ selectionColorToUse ifNil: [ self theme selectionColor ]
 ]
 
 { #category : #accessing }

diff --git a/src/Polymorph-Widgets/UITheme.class.st b/src/Polymorph-Widgets/UITheme.class.st
@@ -2627,7 +2627,7 @@ UITheme >> menuItemSelectedFillStyleFor: aMenuItem [
 
 	Display depth <= 2
 		ifTrue: [ ^ Color gray ].
-	preferenced := self settings menuSelectionColor.
+	preferenced := self menuSelectionColor.
 	baseColor := preferenced ifNil: [ aMenuItem owner color negated ] ifNotNil: [ preferenced ].
 	self preferGradientFill
 		ifFalse: [ ^ baseColor ].
@@ -2660,6 +2660,11 @@ UITheme >> menuPinForm [
 	^ self iconNamed: #menuPinForm
 ]
 
+{ #category : #'accessing colors' }
+UITheme >> menuSelectionColor [
+	^ self settings menuSelectionColor
+]
+
 { #category : #'accessing colors' }
 UITheme >> menuShadowColor [
 	^ self settings menuShadowColor
@@ -2713,7 +2718,7 @@ UITheme >> menubarFillStyleFor: aMenubar [
 
 { #category : #'fill-styles-menubar' }
 UITheme >> menubarItemSelectionFillStyleFor: aMenubarItem [
-	^ self settings menuSelectionColor
+	^ self menuSelectionColor
 ]
 
 { #category : #'fill-styles-menubar' }