toggle skin with animation

pharo-graphics · Jul 19, 2023 · d2bfe13 · d2bfe13
1 parent 2713e6f
commit d2bfe13
Show file tree

Hide file tree

Showing 21 changed files with 486 additions and 705 deletions.
diff --git a/src/Toplo/ToCheckBoxDresser.class.st b/src/Toplo/ToCheckBoxDresser.class.st
diff --git a/src/Toplo/ToCheckBoxDresserDep.class.st b/src/Toplo/ToCheckBoxDresserDep.class.st
diff --git a/src/Toplo/ToCheckMenuItem.class.st b/src/Toplo/ToCheckMenuItem.class.st
@@ -9,7 +9,7 @@ Class {
 { #category : #'t - initialization dresser' }
 ToCheckMenuItem >> defaultDresser [
 
-	^ ToBasicMenuItemDresser next: (ToCheckBoxDresser new)
+	^ ToBasicMenuItemDresser next: (ToCheckableButtonDresser new)
 ]
 
 { #category : #initialization }

diff --git a/src/Toplo/ToCheckableButtonDresser.class.st b/src/Toplo/ToCheckableButtonDresser.class.st
@@ -0,0 +1,40 @@
+Class {
+	#name : #ToCheckableButtonDresser,
+	#superclass : #ToGeneralButtonDresser,
+	#instVars : [
+		'checkableHandler'
+	],
+	#category : #'Toplo-Widget-Button'
+}
+
+{ #category : #'api - install/uninstall  hook' }
+ToCheckableButtonDresser >> checkEvent: anEvent in: anElement [
+
+	anElement dispatchEvent: ToClickLookEvent new.
+	anEvent current ifTrue: [self hoveredState: anElement]
+
+]
+
+{ #category : #'events handling' }
+ToCheckableButtonDresser >> clicked: anElement [
+
+	" ask the button, my checkableHandler (see onInstalledIn:) with send the click look event so don't send to super to avoid unnecessary change "
+	anElement switchToNextState.
+	self hoveredState: anElement 
+
+]
+
+{ #category : #'api - install/uninstall  hook' }
+ToCheckableButtonDresser >> onInstalledIn: anElement [
+
+	super onInstalledIn: anElement.
+	checkableHandler := BlEventHandler on: ToCheckableCheckEvent do: [ :event | self checkEvent: event in: anElement ].
+	anElement addEventHandler: checkableHandler
+]
+
+{ #category : #'api - install/uninstall  hook' }
+ToCheckableButtonDresser >> onUninstalledIn: anElement [
+
+	super onUninstalledIn: anElement.
+	anElement removeEventHandler: checkableHandler
+]
diff --git a/src/Toplo/ToCheckbox.class.st b/src/Toplo/ToCheckbox.class.st
@@ -9,7 +9,7 @@ Class {
 { #category : #'t - initialization dresser' }
 ToCheckbox >> defaultDresser [
 
-	^ ToCheckBoxDresser new
+	^ ToCheckableButtonDresser new
 ]
 
 { #category : #'t - skin accessing' }

diff --git a/src/Toplo/ToGeneralButtonDresser.class.st b/src/Toplo/ToGeneralButtonDresser.class.st
@@ -10,7 +10,9 @@ Class {
 { #category : #'events handling' }
 ToGeneralButtonDresser >> clicked: anElement [
 
-	anElement dispatchEvent: ToClickLookEvent new
+	anElement dispatchEvent: ToClickLookEvent new.
+	self hoveredState: anElement 
+
 ]
 
 { #category : #deprecated }
@@ -142,7 +144,7 @@ ToGeneralButtonDresser >> mouseUpOutsideEvent: anEvent in: anElement [
 	"Outside event can have a button element as target. 
 	In that case, no action is triggered "
 	anEvent consumed: true.
-	(anEvent originalEvent target hasParent: anElement) ifTrue: [
+	(anEvent originalEvent target notNil and: [anEvent originalEvent target hasParent: anElement]) ifTrue: [
 		^ self ].
 	self initialState: anElement
 ]

diff --git a/src/Toplo/ToRadioButton.class.st b/src/Toplo/ToRadioButton.class.st
@@ -7,7 +7,7 @@ Class {
 { #category : #'t - initialization dresser' }
 ToRadioButton >> defaultDresser [
 
-	^ ToCheckBoxDresser new
+	^ ToCheckableButtonDresser new
 ]
 
 { #category : #'t - skin accessing' }

diff --git a/src/Toplo/ToRadioButtonDresserDep.class.st b/src/Toplo/ToRadioButtonDresserDep.class.st
diff --git a/src/Toplo/ToRadioMenuItem.class.st b/src/Toplo/ToRadioMenuItem.class.st
@@ -7,5 +7,5 @@ Class {
 { #category : #'t - initialization dresser' }
 ToRadioMenuItem >> defaultDresser [
 
-	^ ToBasicMenuItemDresser next: ToCheckBoxDresser new
+	^ ToBasicMenuItemDresser next: ToCheckableButtonDresser new
 ]
diff --git a/src/Toplo/ToSandBox.class.st b/src/Toplo/ToSandBox.class.st
@@ -3332,20 +3332,29 @@ ToSandBox class >> example_toggle [
 { #category : #'toggle button' }
 ToSandBox class >> example_toggle2 [
 
-	| th win |
+	| th |
 	th := ToToggleButton new
 		      labelText: 'Cheesecake';
 		      beLabelFirst.
-	th onElement: (ToLabel text: 'ON').
-	th offElement: (ToLabel text: 'OFF').
+	th switchBarOnElement: (ToLabel text: ('Yes!' asRopedText foreground: Color white; bold)).
+	th switchBarOffElement: (ToLabel text: ('No :('asRopedText bold) ).
+	th when: ToCheckableCheckEvent do: [ :event | event current traceCr ].
 	th checked: true.
-	win := ToInnerWindow new
-		       position: 10 @ 10;
-		       size: 400 @ 200;
-		       yourself.
-	win root layout: BlLinearLayout vertical.
-	win root addChild: th.
-	win openInSpace
+	th openInSpace
+]
+
+{ #category : #'toggle button' }
+ToSandBox class >> example_toggle3 [
+
+	| th |
+	th := ToToggleButton new
+		      labelText: 'Cheesecake';
+		      beLabelFirst.
+	th switchButtonOnElement: (ToImage inner: (Smalltalk ui icons iconNamed: #glamorousAccept)).
+	th switchButtonOffElement: (ToImage inner: (Smalltalk ui icons iconNamed: #glamorousClose)).
+	th when: ToCheckableCheckEvent do: [ :event | event current traceCr ].
+	th checked: true.
+	th openInSpace
 ]
 
 { #category : #pane }