Merge pull request #107 from pharo-graphics/hotfix_theme_editor

Hotfix theme editor
pharo-graphics · Feb 16, 2024 · 8539135 · 8539135
2 parents 5e03d97 + 68ffe69
commit 8539135
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/src/Toplo-IDE/ToThemeEditorEventsListenerListController.class.st b/src/Toplo-IDE/ToThemeEditorEventsListenerListController.class.st
@@ -16,11 +16,7 @@ ToThemeEditorEventsListenerListController >> addEventListener [
 
 	| newEventListener |
 	self styleRule ifNil: [ ^ self ].
-	newEventListener := ToPropertyWriter new
-		                    value: [ :e |  ];
-		                    eventClass: ToInstallLookEvent;
-		                    property: self defaultProperty;
-		                    yourself.
+	newEventListener := self defaultEventListner.
 	self styleRule addLookEventListener: newEventListener.
 	self updatePresenterOn: newEventListener
 ]
@@ -32,10 +28,20 @@ ToThemeEditorEventsListenerListController >> allEventListeners [
 	^ self styleRule lookEventListeners
 ]
 
+{ #category : #'as yet unclassified' }
+ToThemeEditorEventsListenerListController >> defaultEventListner [
+	self theme ifNil: [ ^ ToLookEventAction new action: [ :e | ]; yourself ].
+	^ ToPropertyWriter new
+		                    value: [ :e |  ];
+		                    eventClass: ToInstallLookEvent;
+		                    property: self defaultProperty;
+		                    yourself.
+]
+
 { #category : #adding }
 ToThemeEditorEventsListenerListController >> defaultProperty [
 
-	^ self theme styleSheet rawWritablePropertyIndex index atRandom value.
+	^ self theme styleSheet writablePropertyIndex index atRandom value.
 ]
 
 { #category : #adding }

diff --git a/src/Toplo-IDE/ToThemeEditorEventsListenerListPresenterTest.class.st b/src/Toplo-IDE/ToThemeEditorEventsListenerListPresenterTest.class.st
@@ -54,15 +54,37 @@ ToThemeEditorEventsListenerListPresenterTest >> styleRule [
 ]
 
 { #category : #tests }
-ToThemeEditorEventsListenerListPresenterTest >> testActionAddButton [
+ToThemeEditorEventsListenerListPresenterTest >> testActionAddButtonWithNilTheme [
 
 	| previousEventListeners |
+	controller theme: nil.
 	self assert: self presenter eventListenersList items size equals: 2.
 	previousEventListeners := self styleRule lookEventListeners copy.
 	self presenter buttonAdd click.
 	self assert: self presenter eventListenersList items size equals: 3.
 	self assert: self styleRule lookEventListeners size equals: 3.
-	self deny: (previousEventListeners includes: self presenter eventListenersList selectedItem )
+	self deny: (previousEventListeners includes:
+			 self presenter eventListenersList selectedItem).
+	self assert:
+		(self presenter eventListenersList selectedItem isKindOf:
+			 ToLookEventAction)
+]
+
+{ #category : #tests }
+ToThemeEditorEventsListenerListPresenterTest >> testActionAddButtonWithToStyleSheetTheme [
+
+	| previousEventListeners |
+	controller theme: ToStyleSheetTheme new.
+	self assert: self presenter eventListenersList items size equals: 2.
+	previousEventListeners := self styleRule lookEventListeners copy.
+	self presenter buttonAdd click.
+	self assert: self presenter eventListenersList items size equals: 3.
+	self assert: self styleRule lookEventListeners size equals: 3.
+	self deny: (previousEventListeners includes:
+			 self presenter eventListenersList selectedItem).
+	self assert:
+		(self presenter eventListenersList selectedItem isKindOf:
+			 ToPropertyWriter)
 ]
 
 { #category : #tests }