60007

17896 MorphTreeMorph have trouble to update his theme https://pharo.fogbugz.com/f/cases/17896 http://files.pharo.org/image/60/60007.zip
pharo-project · May 16, 2016 · 4143a80 · 4143a80
1 parent cbee242
commit 4143a80
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 12 deletions.
diff --git a/Graphics-Primitives.package/Color.class/instance/conversions/contrastingColorAdjustment.st b/Graphics-Primitives.package/Color.class/instance/conversions/contrastingColorAdjustment.st
@@ -0,0 +1,8 @@
+contrastingColorAdjustment
+	"Answer darker or lighter color depending on the luminance."
+
+	self isTransparent ifTrue: [ ^ self ].
+
+	^ self luminance > 0.5
+		ifTrue: [ self darker ] 
+		ifFalse:  [ self lighter ]
diff --git a/Morphic-Widgets-Tree.package/MorphTreeMorph.class/instance/updating/themeChanged.st b/Morphic-Widgets-Tree.package/MorphTreeMorph.class/instance/updating/themeChanged.st
@@ -0,0 +1,11 @@
+themeChanged
+
+	rowColors at: 1 put: (	
+		rowColors asSet size = 1 
+			ifTrue: [  self theme backgroundColor ]
+			ifFalse: [ rowColors at: 1 put: self theme backgroundColor contrastingColorAdjustment ]
+		).
+
+	rowColors at: 2 put: self theme backgroundColor .
+
+	super themeChanged.
diff --git a/Morphic-Widgets-Tree.package/MorphTreeNodeMorph.class/instance/updating/themeChanged.st b/Morphic-Widgets-Tree.package/MorphTreeNodeMorph.class/instance/updating/themeChanged.st
@@ -1 +1,5 @@
-themeChanged
+themeChanged
+
+	self allMorphsDo: [ :m | (m isKindOf: StringMorph) ifTrue: [ m color: self theme textColor ] ].
+
+	super themeChanged
diff --git a/...s/instance/pharo - scripts/script60006.st → ...s/instance/pharo - scripts/script60007.st b/...s/instance/pharo - scripts/script60006.st → ...s/instance/pharo - scripts/script60007.st
@@ -1,4 +1,4 @@
-script60006
+script60007
 
 	^ 'AST-Core-TheIntegrator.418.mcz
 AST-FFI-Pharo50Compatibility-TheIntegrator.2.mcz
@@ -117,7 +117,7 @@ Graphics-Canvas-TheIntegrator.6.mcz
 Graphics-Display Objects-TheIntegrator.175.mcz
 Graphics-Files-TheIntegrator.76.mcz
 Graphics-Fonts-TheIntegrator.109.mcz
-Graphics-Primitives-TheIntegrator.189.mcz
+Graphics-Primitives-TheIntegrator.192.mcz
 Graphics-Shapes-TheIntegrator.4.mcz
 Graphics-Tests-TheIntegrator.80.mcz
 Graphics-Transformations-TheIntegrator.17.mcz
@@ -193,7 +193,7 @@ Morphic-Widgets-Scrolling-TheIntegrator.32.mcz
 Morphic-Widgets-Tabs-TheIntegrator.20.mcz
 Morphic-Widgets-Taskbar-TheIntegrator.21.mcz
 Morphic-Widgets-TickList-TheIntegrator.2.mcz
-Morphic-Widgets-Tree-TheIntegrator.50.mcz
+Morphic-Widgets-Tree-TheIntegrator.52.mcz
 Morphic-Widgets-Windows-TheIntegrator.97.mcz
 Multilingual-Encodings-TheIntegrator.61.mcz
 Multilingual-Languages-TheIntegrator.55.mcz

diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60006.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60006.st
diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60007.st b/ScriptLoader60.package/ScriptLoader.class/instance/pharo - updates/update60007.st
@@ -0,0 +1,6 @@
+update60007
+	"self new update60007"
+	self withUpdateLog: '17896 MorphTreeMorph have trouble to update his theme
+	https://pharo.fogbugz.com/f/cases/17896'.
+	self loadTogether: self script60007 merge: false.
+	self flushCaches.
diff --git a/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader60.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
@@ -1,3 +1,3 @@
 commentForCurrentUpdate
- ^ '18230 Critic Browser window title set to nil after deselecting a rule
-	https://pharo.fogbugz.com/f/cases/18230'
+ ^ '17896 MorphTreeMorph have trouble to update his theme
+	https://pharo.fogbugz.com/f/cases/17896'