introduced ToElementState

fixed MouseUpOutside users
pharo-graphics · Jul 17, 2023 · ec8fc03 · ec8fc03
1 parent 5037261
commit ec8fc03
Show file tree

Hide file tree

Showing 36 changed files with 365 additions and 335 deletions.
diff --git a/src/Toplo-Incubator/ToNotebookExamples.class.st b/src/Toplo-Incubator/ToNotebookExamples.class.st
@@ -0,0 +1,35 @@
+Class {
+	#name : #ToNotebookExamples,
+	#superclass : #Object,
+	#category : #'Toplo-Incubator'
+}
+
+{ #category : #tabs }
+ToNotebookExamples class >> example_tabsWith2Pages [
+
+	| aNotebook redPage greenPage redCount greenCount |
+	aNotebook := ToNotebook new.
+
+	redCount := 0.
+	redPage := aNotebook addPageTitle: 'Red' bodyFactory: [
+		           redCount := redCount + 1.
+		           BlTextElement new
+			           text:
+				           (redCount asRopedText foreground: Color red darker);
+			           yourself ].
+
+	greenCount := 0.
+	greenPage := aNotebook addPageTitle: 'Green' bodyFactory: [
+		             greenCount := greenCount + 1.
+		             BlTextElement new
+			             text:
+				             (greenCount asRopedText foreground:
+						              Color green muchDarker);
+			             yourself ].
+
+	aNotebook openInSpace
+]
+
+{ #category : #'see class side' }
+ToNotebookExamples >> seeClassSide [ 
+]
diff --git a/src/Toplo/ToBackgroundLook.class.st b/src/Toplo/ToBackgroundLook.class.st
@@ -21,6 +21,14 @@ ToBackgroundLook >> hoverBg: aBackground [
 	hoverBg := aBackground
 ]
 
+{ #category : #'event handling' }
+ToBackgroundLook >> hoveredLookEvent: anEvent [
+
+	super hoveredLookEvent: anEvent.
+	anEvent elementDo: [ :e |
+		self hoverBg ifNotNil: [ :bg | e background: bg ] ]
+]
+
 { #category : #accessing }
 ToBackgroundLook >> initialBg [
 
@@ -41,22 +49,6 @@ ToBackgroundLook >> initialLookEvent: anEvent [
 		self initialBg ifNotNil: [ :bg | e background: bg ] ]
 ]
 
-{ #category : #'event handling' }
-ToBackgroundLook >> mouseHoverLookEvent: anEvent [
-
-	super mouseHoverLookEvent: anEvent.
-	anEvent elementDo: [ :e |
-		self hoverBg ifNotNil: [ :bg | e background: bg ] ]
-]
-
-{ #category : #'event handling' }
-ToBackgroundLook >> mousePressedLookEvent: anEvent [
-
-	super mousePressedLookEvent: anEvent.
-	anEvent elementDo: [ :e |
-		self pressedBg ifNotNil: [ :bg | e background: bg ] ]
-]
-
 { #category : #accessing }
 ToBackgroundLook >> pressedBg [
 
@@ -68,3 +60,11 @@ ToBackgroundLook >> pressedBg: aBackground [
 
 	pressedBg := aBackground
 ]
+
+{ #category : #'event handling' }
+ToBackgroundLook >> pressedLookEvent: anEvent [
+
+	super pressedLookEvent: anEvent.
+	anEvent elementDo: [ :e |
+		self pressedBg ifNotNil: [ :bg | e background: bg ] ]
+]
diff --git a/src/Toplo/ToBorderLook.class.st b/src/Toplo/ToBorderLook.class.st
@@ -68,6 +68,17 @@ ToBorderLook >> hoverPaint: aPaint [
 	hoverPaint := aPaint
 ]
 
+{ #category : #'event handling' }
+ToBorderLook >> hoveredLookEvent: anEvent [
+
+	super hoveredLookEvent: anEvent.
+	self hoverPaint ifNil: [ ^ self ].
+	anEvent elementDo: [ :e |
+		e border: (self builder
+				 paint: self hoverPaint;
+				 build) ]
+]
+
 { #category : #'event handling' }
 ToBorderLook >> initialLookEvent: anEvent [
 
@@ -99,20 +110,9 @@ ToBorderLook >> initialize [
 ]
 
 { #category : #'event handling' }
-ToBorderLook >> mouseHoverLookEvent: anEvent [
-
-	super mouseHoverLookEvent: anEvent.
-	self hoverPaint ifNil: [ ^ self ].
-	anEvent elementDo: [ :e |
-		e border: (self builder
-				 paint: self hoverPaint;
-				 build) ]
-]
-
-{ #category : #'event handling' }
-ToBorderLook >> mousePressedLookEvent: anEvent [
+ToBorderLook >> pressedLookEvent: anEvent [
 
-	super mousePressedLookEvent: anEvent.
+	super pressedLookEvent: anEvent.
 	self pressedPaint ifNil: [ ^ self ].
 	anEvent elementDo: [ :e |
 		e border: (self builder

diff --git a/src/Toplo/ToCheckBoxDresser.class.st b/src/Toplo/ToCheckBoxDresser.class.st
@@ -40,7 +40,7 @@ ToCheckBoxDresser >> defaultCheckedIconImage [
 { #category : #initialization }
 ToCheckBoxDresser >> defaultCheckedState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #checked;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: self defaultCheckedIconImage.
@@ -85,7 +85,7 @@ ToCheckBoxDresser >> defaultIndeterminateIconImage [
 { #category : #initialization }
 ToCheckBoxDresser >> defaultIndeterminateState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #indeterminate;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: self defaultIndeterminateIconImage ];
@@ -107,7 +107,7 @@ ToCheckBoxDresser >> defaultUncheckedIconImage [
 { #category : #initialization }
 ToCheckBoxDresser >> defaultUncheckedState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #unchecked;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: self defaultUncheckedIconImage ]

diff --git a/src/Toplo/ToCheckNodeDresser.class.st b/src/Toplo/ToCheckNodeDresser.class.st
@@ -42,7 +42,7 @@ ToCheckNodeDresser >> defaultCheckedIconImage [
 { #category : #initialization }
 ToCheckNodeDresser >> defaultCheckedState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #checked;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: self defaultCheckedIconImage.
@@ -87,7 +87,7 @@ ToCheckNodeDresser >> defaultIndeterminateIconImage [
 { #category : #initialization }
 ToCheckNodeDresser >> defaultIndeterminateState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #indeterminate;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: self defaultIndeterminateIconImage ];
@@ -109,7 +109,7 @@ ToCheckNodeDresser >> defaultUncheckedIconImage [
 { #category : #initialization }
 ToCheckNodeDresser >> defaultUncheckedState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #unchecked;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: self defaultUncheckedIconImage ]

diff --git a/src/Toplo/ToChoiceBoxMenuItemDresser.class.st b/src/Toplo/ToChoiceBoxMenuItemDresser.class.st
@@ -13,7 +13,7 @@ ToChoiceBoxMenuItemDresser >> defaultCheckedIconImage [
 { #category : #initialization }
 ToChoiceBoxMenuItemDresser >> defaultCheckedState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #checked;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: (ToImage inner: self defaultCheckedIconImage) ];
@@ -31,7 +31,7 @@ ToChoiceBoxMenuItemDresser >> defaultUncheckedIconImage [
 { #category : #initialization }
 ToChoiceBoxMenuItemDresser >> defaultUncheckedState [
 
-	^ ToElementState new
+	^ ToElementStateDep new
 		  name: #unchecked;
 		  whenEnterDo: [ :ann | 
 			  ann widget icon: (ToImage inner: self defaultUncheckedIconImage) ]

diff --git a/src/Toplo/ToContextMenuDresser.class.st b/src/Toplo/ToContextMenuDresser.class.st
@@ -8,7 +8,7 @@ Class {
 ToContextMenuDresser >> mouseUpOutside: anEvent in: aMenuWindow [
 
 	| origEventTarget |
-	origEventTarget := anEvent originalEvent currentTarget.
+	origEventTarget := anEvent originalEvent target.
 	origEventTarget ifNil: [
 		^ super mouseUpOutside: anEvent in: aMenuWindow ].
 	(origEventTarget hasInParentChain: aMenuWindow widget) ifTrue: [

diff --git a/src/Toplo/ToDisableLookEvent.class.st b/src/Toplo/ToDisableLookEvent.class.st
diff --git a/src/Toplo/ToDisabledState.class.st b/src/Toplo/ToDisabledState.class.st
@@ -0,0 +1,11 @@
+Class {
+	#name : #ToDisabledState,
+	#superclass : #ToElementState,
+	#category : #'Toplo-Core-Theme-States'
+}
+
+{ #category : #'look event sending' }
+ToDisabledState >> sendEvent: anEvent toLook: aLook [
+
+	aLook disabledLookEvent: anEvent
+]
diff --git a/src/Toplo/ToElementLook.class.st b/src/Toplo/ToElementLook.class.st
@@ -28,36 +28,30 @@ ToElementLook >> elementLookEvent: anEvent [
 ]
 
 { #category : #'event handling' }
-ToElementLook >> initialLookEvent: anEvent [
+ToElementLook >> hoveredLookEvent: anEvent [
 
 
 ]
 
 { #category : #'event handling' }
-ToElementLook >> installLookEvent: anEvent [
-
-]
+ToElementLook >> initialLookEvent: anEvent [
 
-{ #category : #testing }
-ToElementLook >> isNull [
 
-	^ false
 ]
 
 { #category : #'event handling' }
-ToElementLook >> mouseHoverLookEvent: anEvent [
-
+ToElementLook >> installLookEvent: anEvent [
 
 ]
 
-{ #category : #'event handling' }
-ToElementLook >> mouseLeavedLookEvent: anEvent [
-
+{ #category : #testing }
+ToElementLook >> isNull [
 
+	^ false
 ]
 
 { #category : #'event handling' }
-ToElementLook >> mousePressedLookEvent: anEvent [
+ToElementLook >> leavedLookEvent: anEvent [
 
 
 ]
@@ -74,6 +68,12 @@ ToElementLook >> next: aLook [
 	next := aLook
 ]
 
+{ #category : #'event handling' }
+ToElementLook >> pressedLookEvent: anEvent [
+
+
+]
+
 { #category : #removing }
 ToElementLook >> removeLook: aLook previous: previousLook [
 

diff --git a/src/Toplo/ToElementLookEventHandler.class.st b/src/Toplo/ToElementLookEventHandler.class.st
@@ -20,7 +20,7 @@ ToElementLookEventHandler >> addLook: aLook [
 ToElementLookEventHandler >> elementAddedToSceneGraphEvent: anEvent [
 
 	anEvent target dispatchEvent: (ToInstallLookEvent new copyFrom: anEvent).
-	anEvent target dispatchEvent: (ToInitialLookEvent new copyFrom: anEvent)
+	anEvent target dispatchEvent: ((ToElementStateChangedEvent new state: ToInitialState new) copyFrom: anEvent)
 ]
 
 { #category : #'event handling' }
@@ -86,6 +86,6 @@ ToElementLookEventHandler >> themeChanged: anEvent in: anElement [
 
 	anEvent target dispatchEvent: (ToUninstallLookEvent new copyFrom: anEvent).
 	anEvent target dispatchEvent: (ToInstallLookEvent new copyFrom: anEvent).
-	anEvent target dispatchEvent: (ToInitialLookEvent new copyFrom: anEvent).
+	anEvent target dispatchEvent: ((ToElementStateChangedEvent new state: ToInitialState new) copyFrom: anEvent).
 	anEvent target dispatchEvent: lastEvent clone
 ]
diff --git a/src/Toplo/ToElementMouseRelatedLookEvent.class.st b/src/Toplo/ToElementMouseRelatedLookEvent.class.st