fixed cursor element in not editable but selectable editor element

pharo-graphics · Dec 3, 2024 · bee2443 · bee2443
1 parent 909b75c
commit bee2443
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/Album/AlbCursorElement.class.st b/src/Album/AlbCursorElement.class.st
@@ -65,18 +65,24 @@ AlbCursorElement >> newBlinkingTask [
 ]
 
 { #category : #'private - focus' }
-AlbCursorElement >> onGotFocus [
-
-	self background: self focusedBackground.
-	self startBlinkingTask 
-
+AlbCursorElement >> onGotFocusIn: anEditorElement [
+
+	anEditorElement isEditable
+		ifTrue: [
+			self background: self focusedBackground.
+			self startBlinkingTask ]
+		ifFalse: [
+			self stopBlinkingTask.
+			self background: BlBackground transparent ]
 ]
 
 { #category : #'private - focus' }
-AlbCursorElement >> onLostFocus [
+AlbCursorElement >> onLostFocusIn: anEditorElement [
 
-	self background: self defaultBlurredBackground.
-	self stopBlinkingTask 
+	anEditorElement isEditable
+		ifTrue: [ self background: self defaultBlurredBackground ]
+		ifFalse: [ self background: BlBackground transparent ].
+	self stopBlinkingTask
 ]
 
 { #category : #initialization }

diff --git a/src/Album/AlbInfiniteEditorElement.class.st b/src/Album/AlbInfiniteEditorElement.class.st
@@ -273,7 +273,6 @@ AlbInfiniteEditorElement >> infinite [
 AlbInfiniteEditorElement >> initialize [
 
 	super initialize.
-	self initializeCursorElement.
 	self mode: self defaultMode.
 	self matchParent
 ]
@@ -284,6 +283,7 @@ AlbInfiniteEditorElement >> initializeCursorElement [
 	If not, dbl clicking will not work because the target of the first click may 
 	be different from the one of the second click"
 
+	cursorElement ifNotNil: [ cursorElement removeFromParent ].
 	cursorElement := AlbCursorElement new
 		                 background: self defaultCursorBackground;
 		                 yourself
@@ -337,6 +337,7 @@ AlbInfiniteEditorElement >> mode: anEditabilityMode [
 
 	mode = anEditabilityMode ifTrue: [ ^ self ].
 	mode := anEditabilityMode.
+	self initializeCursorElement.
 	self dispatchEvent: AlbInfiniteModeChangedEvent new
 ]
 
@@ -383,11 +384,7 @@ AlbInfiniteEditorElement >> onExtentChanged [
 AlbInfiniteEditorElement >> onGotFocus [
 
 	self editor onGotFocus.
-	self cursorElement onGotFocus.
-	self cursorElement hasParent ifFalse: [
-		self selecter
-			from: 0 to: 0;
-			select ]
+	self cursorElement onGotFocusIn: self
 ]
 
 { #category : #'hooks - layout' }
@@ -401,7 +398,7 @@ AlbInfiniteEditorElement >> onLayoutDone [
 AlbInfiniteEditorElement >> onLostFocus [
 
 	self editor onLostFocus.
-	self cursorElement onLostFocus
+	self cursorElement onLostFocusIn: self
 ]
 
 { #category : #'hooks - scrolling' }

diff --git a/src/Album/AlbTextEditorAbstractSegmentPiece.class.st b/src/Album/AlbTextEditorAbstractSegmentPiece.class.st
@@ -19,7 +19,6 @@ AlbTextEditorAbstractSegmentPiece >> addCursor: aPieceElement of: aLineSegment i
 	(globalCursor insideSubText: self of: aLineSegment) ifFalse: [^self ].
 	currentCursor := self globalCursorToLocal: globalCursor.
 	"tell to add the new cursor"
-	anEditorElement isEditable ifFalse: [ ^ self ].
 	self onCursorAdded: currentCursor to: aPieceElement in: anEditorElement
 ]