fixing readOnlyWithSelection/editable with focus/unfocused

pharo-graphics · Dec 18, 2024 · 26257a7 · 26257a7
1 parent 3ca2953
commit 26257a7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/Album/AlbTextEditorMouseHandler.class.st b/src/Album/AlbTextEditorMouseHandler.class.st
@@ -18,29 +18,33 @@ AlbTextEditorMouseHandler >> mouseDownEvent: anEvent [
 
 	anEvent consume.
 	aScreenPosition := (element
-		                    localBoundsToMine: (BlBounds origin: anEvent localPosition extent: 0.0 @ 0.0)
+		                    localBoundsToMine:
+		                    (BlBounds
+			                     origin: anEvent localPosition
+			                     extent: 0.0 @ 0.0)
 		                    fromChild: anEvent currentTarget) center.
 	editor := element editor.
 	aNavigator := editor navigator.
-	aTextIndex := aNavigator findTextIndexAtScreenPosition: aScreenPosition ifAbsent: [ nil ].
+	aTextIndex := aNavigator
+		              findTextIndexAtScreenPosition: aScreenPosition
+		              ifAbsent: [ nil ].
 
 	anEvent modifiers isShift
-		ifTrue: [ 
-			aTextIndex ifNotNil: [ 
+		ifTrue: [
+			aTextIndex ifNotNil: [
 				(editor selection contains: aTextIndex)
-					ifTrue: [ 
+					ifTrue: [
 						editor deselecter
 							from: aTextIndex to: editor selection indices last;
 							deselect ]
-					ifFalse: [ 
+					ifFalse: [
 						editor selecter
 							extendToIndex: aTextIndex;
 							select ] ] ]
-		ifFalse: [ 
-			(element hasFocus ) ifTrue: [ 
-				editor deselecter all deselect ] ].
+		ifFalse: [
+		element hasFocus ifTrue: [ editor deselecter all deselect ] ].
 	aNavigator moveToScreenPosition: aScreenPosition.
-	element requestFocus.
+	element isEnabled ifTrue: [ element requestFocus ].
 	aNavigator apply.
 
 	anEvent sendTo: element

diff --git a/src/Album/AlbTextWordPieceStencil.class.st b/src/Album/AlbTextWordPieceStencil.class.st
@@ -26,11 +26,12 @@ AlbTextWordPieceStencil class >> readOnly [
 { #category : #'api - instantiation' }
 AlbTextWordPieceStencil >> allEventHandlers [
 
-	"^ readOnly
+
+	self flag: 'To Check if it works when a #beReadonlyWithSelection is followed by a #beEditable sent'.
+	^ readOnly
 		  ifTrue: [ self readOnlyWordPieceEventHandlers ]
-		  ifFalse: [ self editableWordPieceEventHandlers ]"
-	self flag: 'previous version does not work when a #beReadonlyWithSelection is followed by a #beEditable sent. This is the case in ToAlbumSkin>>enabledSkinEvent: and #disabledSkinEvent:'.
-	^ self editableWordPieceEventHandlers
+		  ifFalse: [ self editableWordPieceEventHandlers ]
+	"^ self editableWordPieceEventHandlers"
 ]
 
 { #category : #'api - instantiation' }