Merge pull request #7 from botwhytho/feature-enable-all-modifiers-button

JurajKubelka · web-flow · commit 796f283f326a · 2024-12-12T12:46:17.000-03:00
Enable clicking a button while arbitrary modifiers are pressed [feenkcom/gtoolkit#4239]
diff --git a/src/Brick/BrButton.class.st b/src/Brick/BrButton.class.st
@@ -36,6 +36,16 @@ BrButton >> baselineOffset [
 		ifNone: [ 0 ]
 ]
 
+{ #category : #'api - widget' }
+BrButton >> disableAllModifiers [
+	self viewModel disableAllModifiers
+]
+
+{ #category : #'api - widget' }
+BrButton >> enableAllModifiers [
+	self viewModel enableAllModifiers
+]
+
 { #category : #accessing }
 BrButton >> gtActionFor: aView [
 	<gtView>
diff --git a/src/Brick/BrButtonModel.class.st b/src/Brick/BrButtonModel.class.st
@@ -15,7 +15,8 @@ Class {
 	#name : #BrButtonModel,
 	#superclass : #BrWidgetModel,
 	#instVars : [
-		'action'
+		'action',
+		'enableAllModifiers'
 	],
 	#category : #'Brick-Button - Model'
 }
@@ -56,6 +57,16 @@ BrButtonModel >> clickEvent: anEvent [
 		ifFalse: [ self action gtValueWithArgs: { self widget . self . anEvent } ]
 ]
 
+{ #category : #'mouse handlers' }
+BrButtonModel >> disableAllModifiers [
+	enableAllModifiers := false
+]
+
+{ #category : #'mouse handlers' }
+BrButtonModel >> enableAllModifiers [
+	enableAllModifiers := true
+]
+
 { #category : #'gt-extension' }
 BrButtonModel >> gtActionFor: aView [
 	<gtView>
@@ -90,14 +101,18 @@ BrButtonModel >> hasModifiers: anEvent [
 BrButtonModel >> initialize [
 	super initialize.
 
-	action := [ :anElement :aButtonModel :anEvent | ]
+	action := [ :anElement :aButtonModel :anEvent |  ].
+	self disableAllModifiers
 ]
 
 { #category : #initialization }
 BrButtonModel >> initializeListeners [
 	self
 		when: BlClickEvent
-		do: [ :anEvent | (self hasModifiers: anEvent) ifFalse: [ self clickEvent: anEvent ] ].
+		do: [ :anEvent | 
+			(enableAllModifiers or: [ (self hasModifiers: anEvent) not ])
+				ifTrue: [ self clickEvent: anEvent ] ].
+				
 	self
 		when: BlFocusInEvent
 		do: [ self
