fixed ToLAFButtonDresser

pharo-graphics · Jul 1, 2023 · 9f65b21 · 9f65b21
1 parent 495211f
commit 9f65b21
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 113 deletions.
diff --git a/src/Toplo-LookAndFeel/BlElement.extension.st b/src/Toplo-LookAndFeel/BlElement.extension.st
diff --git a/src/Toplo-LookAndFeel/OBlSpace.extension.st b/src/Toplo-LookAndFeel/OBlSpace.extension.st
diff --git a/src/Toplo-LookAndFeel/ToLAFButtonDresser.class.st b/src/Toplo-LookAndFeel/ToLAFButtonDresser.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #ToLAFButtonDresser,
-	#superclass : #ToAbstractButtonDresser,
+	#superclass : #ToGeneralButtonDresser,
 	#traits : 'TToSkinnableElementDresser',
 	#classTraits : 'TToSkinnableElementDresser classTrait',
 	#category : #'Toplo-LookAndFeel-Dressers'
@@ -92,6 +92,12 @@ ToLAFButtonDresser >> leftPressed: anElement event: anEvent [
 	(image notNil and:[image dresser notNil]) ifTrue:[ image dresser leftPressed: image event: anEvent ].
 ]
 
+{ #category : #'events handling' }
+ToLAFButtonDresser >> leftUp: anElement event: anEvent [
+
+	self hover: anElement event: anEvent
+]
+
 { #category : #'api - install/uninstall  hook' }
 ToLAFButtonDresser >> onInstalledIn: anElement [
 

diff --git a/src/Toplo/ToAbstractButtonDresser.class.st b/src/Toplo/ToAbstractButtonDresser.class.st
@@ -57,7 +57,7 @@ ToAbstractButtonDresser >> up: anElement event: anEvent [
 	super up:  anElement event: anEvent.
 	"mouse up must be consumed here so that BlClickCandidateEvent is created 
 	with the right BlMouseUpEvent"
-	anEvent consumed: true.
 	anEvent primaryButtonPressed ifFalse: [ ^ self ].
+	anEvent consumed: true.
 
 ]
diff --git a/src/Toplo/ToGeneralButtonDresser.class.st b/src/Toplo/ToGeneralButtonDresser.class.st
@@ -108,6 +108,7 @@ ToGeneralButtonDresser >> installEventListenersIn: anElement [
 { #category : #'events handling' }
 ToGeneralButtonDresser >> leaved: anElement event: anEvent [
 
+	super leaved: anElement event: anEvent.
 	self border: initialBorder in: anElement.
 	self background: initialBackground in: anElement
 

diff --git a/src/Toplo/ToSandBox.class.st b/src/Toplo/ToSandBox.class.st
@@ -2066,7 +2066,7 @@ ToSandBox class >> example_toButtonWithIconAndText [
 		             yourself.
 	but icon: iconImage.
 	but padding: (BlInsets all: 4).
-	but when: BlClickEvent do: [ :event | event currentTarget traceCr ].
+	but when: BlPrimaryClickEvent do: [ :event | event currentTarget traceCr ].
 
 	space := OBlSpace new.
 	space root addChild: but.

diff --git a/src/Toplo/ToWidgetWindowElement.class.st b/src/Toplo/ToWidgetWindowElement.class.st
@@ -30,7 +30,7 @@ ToWidgetWindowElement >> animate: aBoolean [
 { #category : #accessing }
 ToWidgetWindowElement >> autoCloseOnMouseUpDelay [
 
-	^ 250 milliSeconds 
+	^ 300 milliSeconds 
 ]
 
 { #category : #'api - displaying' }