Upgrade to Scintilla 5.5.0

dolphinsmalltalk · Jun 23, 2024 · 2cbc3e7 · 2cbc3e7
1 parent b0d6bde
commit 2cbc3e7
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 5 deletions.
diff --git a/Core/DolphinVM/Res/ScintillaView.ico b/Core/DolphinVM/Res/ScintillaView.ico
diff --git a/Core/Object Arts/Dolphin/IDE/Professional/Tools.Scintilla.ScintillaViewGenerator.cls b/Core/Object Arts/Dolphin/IDE/Professional/Tools.Scintilla.ScintillaViewGenerator.cls
@@ -247,6 +247,8 @@ defineConstantsPool
 				'SC_ELEMENT_SELECTION_ADDITIONAL_BACK' -> 13.
 				'SC_ELEMENT_SELECTION_ADDITIONAL_TEXT' -> 12.
 				'SC_ELEMENT_SELECTION_BACK' -> 11.
+				'SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK' -> 19.
+				'SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT' -> 18.
 				'SC_ELEMENT_SELECTION_INACTIVE_BACK' -> 17.
 				'SC_ELEMENT_SELECTION_INACTIVE_TEXT' -> 16.
 				'SC_ELEMENT_SELECTION_SECONDARY_BACK' -> 15.

diff --git a/Core/Object Arts/Dolphin/MVP/Views/Scintilla/Dolphin Scintilla View.pax b/Core/Object Arts/Dolphin/MVP/Views/Scintilla/Dolphin Scintilla View.pax
@@ -299,6 +299,8 @@ UI
 			'SC_ELEMENT_SELECTION_ADDITIONAL_BACK' -> 16rD.
 			'SC_ELEMENT_SELECTION_ADDITIONAL_TEXT' -> 16rC.
 			'SC_ELEMENT_SELECTION_BACK' -> 16rB.
+			'SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK' -> 16r13.
+			'SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT' -> 16r12.
 			'SC_ELEMENT_SELECTION_INACTIVE_BACK' -> 16r11.
 			'SC_ELEMENT_SELECTION_INACTIVE_TEXT' -> 16r10.
 			'SC_ELEMENT_SELECTION_SECONDARY_BACK' -> 16rF.

diff --git a/Core/Object Arts/Dolphin/MVP/Views/Scintilla/Scintilla.iface b/Core/Object Arts/Dolphin/MVP/Views/Scintilla/Scintilla.iface
@@ -717,6 +717,8 @@ val SC_ELEMENT_SELECTION_SECONDARY_TEXT=14
 val SC_ELEMENT_SELECTION_SECONDARY_BACK=15
 val SC_ELEMENT_SELECTION_INACTIVE_TEXT=16
 val SC_ELEMENT_SELECTION_INACTIVE_BACK=17
+val SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT=18
+val SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK=19
 val SC_ELEMENT_CARET=40
 val SC_ELEMENT_CARET_ADDITIONAL=41
 val SC_ELEMENT_CARET_LINE_BACK=50

diff --git a/Core/Object Arts/Dolphin/MVP/Views/Scintilla/UI.Scintilla.ScintillaLibrary.cls b/Core/Object Arts/Dolphin/MVP/Views/Scintilla/UI.Scintilla.ScintillaLibrary.cls
@@ -66,7 +66,7 @@ fileName
 versionString
 	"Answer the version of the Scintilla control for which this library was generated."
 
-	^'5.4.3'! !
+	^'5.5.0'! !
 !UI.Scintilla.ScintillaLibrary class categoriesForMethods!
 closeDefault!private!realizing/unrealizing! !
 fileName!constants!public! !

diff --git a/Core/Object Arts/Dolphin/MVP/Views/Scintilla/UI.Scintilla.ScintillaView.cls b/Core/Object Arts/Dolphin/MVP/Views/Scintilla/UI.Scintilla.ScintillaView.cls
@@ -2876,6 +2876,26 @@ imeMode: aSymbol
 				ifNil: [SC_IME_WINDOWED]
 				ifNotNil: [(self class imeInteractionModes keyAtValue: aSymbol) - 1])!
 
+inactiveSecondarySelectionBackcolor
+	"Answer the background <Color> of the secondary selections when the view does not have focus. The colour can have translucency (alpha), but will be drawn opaquely if the #selectionLayer is not set to #underText or #overText, the default #selectionLayer being #base."
+
+	^self getElementColor: SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK!
+
+inactiveSecondarySelectionBackcolor: aColor
+	"Set the background colour of secondary selections when another window has focus"
+
+	self setOrResetElement: SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK color: aColor!
+
+inactiveSecondarySelectionForecolor
+	"Answer the foreground <Color> (i.e. text colour) of secondary selections when the view does not have focus. The colour can have translucency (alpha), but will be drawn opaquely if the #selectionLayer is not set to #underText or #overText, the default #selectionLayer being #base."
+
+	^self getElementColor: SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT!
+
+inactiveSecondarySelectionForecolor: aColor
+	"Set the foreground colour of secondary selections when another window has focus"
+
+	self setOrResetElement: SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT color: aColor!
+
 inactiveSelectionBackcolor
 	"Answer the background <Color> of the selection when the view does not have focus. The colour can have translucency (alpha), but will be drawn opaquely if the #selectionLayer is not set to #underText or #overText, the default #selectionLayer being #base."
 
@@ -10421,6 +10441,10 @@ idOfStyleNamed:!helpers!private! !
 imageIndexForIcon:!autocompletion!helpers!private! !
 imeMode!ime!other settings!public! !
 imeMode:!other settings!public! !
+inactiveSecondarySelectionBackcolor!caret, selection, and hotspot styles!element colors!public! !
+inactiveSecondarySelectionBackcolor:!caret, selection, and hotspot styles!element colors!public! !
+inactiveSecondarySelectionForecolor!caret, selection, and hotspot styles!element colors!public! !
+inactiveSecondarySelectionForecolor:!caret, selection, and hotspot styles!element colors!public! !
 inactiveSelectionBackcolor!caret, selection, and hotspot styles!element colors!public! !
 inactiveSelectionBackcolor:!caret, selection, and hotspot styles!element colors!public! !
 inactiveSelectionForecolor!caret, selection, and hotspot styles!element colors!public! !

diff --git a/Core/Object Arts/Dolphin/MVP/Views/Scintilla/UI.Scintilla.cls b/Core/Object Arts/Dolphin/MVP/Views/Scintilla/UI.Scintilla.cls
@@ -171,6 +171,8 @@ UI
 			'SC_ELEMENT_SELECTION_ADDITIONAL_BACK' -> 16rD.
 			'SC_ELEMENT_SELECTION_ADDITIONAL_TEXT' -> 16rC.
 			'SC_ELEMENT_SELECTION_BACK' -> 16rB.
+			'SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_BACK' -> 16r13.
+			'SC_ELEMENT_SELECTION_INACTIVE_ADDITIONAL_TEXT' -> 16r12.
 			'SC_ELEMENT_SELECTION_INACTIVE_BACK' -> 16r11.
 			'SC_ELEMENT_SELECTION_INACTIVE_TEXT' -> 16r10.
 			'SC_ELEMENT_SELECTION_SECONDARY_BACK' -> 16rF.

diff --git a/Lexilla.dll b/Lexilla.dll
diff --git a/Scintilla.dll b/Scintilla.dll