SelectionInListView.st
branchdelegated_gc_text-view-selection-refactoring
changeset 5129 9549b0a1dbf5
parent 4999 7ca486a26aa1
parent 5121 f3bc3a3c7eba
child 5221 d036f1df0408
--- a/SelectionInListView.st	Mon Jun 16 10:44:36 2014 +0100
+++ b/SelectionInListView.st	Mon Sep 08 17:09:06 2014 +0100
@@ -29,7 +29,9 @@
 		DefaultHilightFrameColor DefaultHilightLevel
 		DefaultRightArrowStyle DefaultRightArrowLevel
 		DefaultDisabledForegroundColor DefaultShadowColor
-		DefaultLightColor DefaultHilightStyle'
+		DefaultLightColor DefaultHilightStyle
+		DefaultHilightForegroundColorNoFocus
+		DefaultHilightBackgroundColorNoFocus'
 	poolDictionaries:''
 	category:'Views-Lists'
 !
@@ -1037,6 +1039,7 @@
 
     <resource: #style (#'selection.disabledForegroundColor'
                        #'selection.hilightForegroundColor' #'selection.hilightBackgroundColor'
+                       #'selection.hilightForegroundColorNoFocus' #'selection.hilightBackgroundColorNoFocus'
                        #'selection.hilightFrameColor' #'selection.hilightLevel'
                        #'selection.rightArrowStyle' #'selection.rightArrowLevel'
                        #'selection.foregroundColor' #'selection.backgroundColor'
@@ -1046,6 +1049,8 @@
     DefaultDisabledForegroundColor := StyleSheet colorAt:#'selection.disabledForegroundColor'.
     DefaultHilightForegroundColor := StyleSheet colorAt:#'selection.hilightForegroundColor'.
     DefaultHilightBackgroundColor := StyleSheet colorAt:#'selection.hilightBackgroundColor'.
+    DefaultHilightForegroundColorNoFocus := StyleSheet colorAt:#'selection.hilightForegroundColorNoFocus'.
+    DefaultHilightBackgroundColorNoFocus := StyleSheet colorAt:#'selection.hilightBackgroundColorNoFocus'.
     DefaultHilightFrameColor := StyleSheet colorAt:#'selection.hilightFrameColor'.
     DefaultHilightLevel := StyleSheet at:#'selection.hilightLevel' default:0.
     DefaultHilightStyle := StyleSheet at:#'selection.hilightStyle' default:(StyleSheet name).
@@ -1261,7 +1266,7 @@
 
     (index > self size) ifFalse:[
         listAttributes isNil ifTrue:[
-            listAttributes := OrderedCollection withSize:index
+            listAttributes := OrderedCollection newWithSize:index
         ] ifFalse:[
             (index > listAttributes size) ifTrue:[
                 listAttributes grow:index
@@ -2816,7 +2821,7 @@
             ] ifFalse:[
                 (hilightStyle == #openwin) ifTrue:[
                     hilightFgColor := fgColor.
-                    hilightBgColor := Color grey.
+                    hilightBgColor := Color gray.
                     smallArrow := true.
                 ] ifFalse:[
                     (hilightStyle == #win95) ifTrue:[
@@ -2885,10 +2890,16 @@
     ].
 
     hilightFgColorNoFocus isNil ifTrue:[
-        hilightFgColorNoFocus := hilightFgColor.
+        hilightFgColorNoFocus := DefaultHilightForegroundColorNoFocus.
+        hilightFgColorNoFocus isNil ifTrue:[
+            hilightFgColorNoFocus := hilightFgColor slightlyLightened.
+        ]
     ].
     hilightBgColorNoFocus isNil ifTrue:[
-        hilightBgColorNoFocus := hilightBgColor lightened.
+        hilightBgColorNoFocus := DefaultHilightBackgroundColorNoFocus.
+        hilightBgColorNoFocus isNil ifTrue:[
+            hilightBgColorNoFocus := hilightBgColor slightlyLightened.
+        ]
     ].
 
     "Modified: / 05-08-1998 / 00:00:00 / cg"
@@ -2935,6 +2946,15 @@
     "Modified: 27.2.1997 / 14:23:40 / cg"
 ! !
 
+!SelectionInListView methodsFor:'native widget support'!
+
+nativeWindowType
+    "return a symbol describing my native window type 
+     (may be used internally by the device as a native window creation hint)"
+
+    ^ #SelectionInListView
+! !
+
 !SelectionInListView methodsFor:'private'!
 
 argForChangeMessage
@@ -4148,11 +4168,11 @@
 !SelectionInListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.274 2014-03-26 09:55:36 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.278 2014-08-03 12:27:28 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.274 2014-03-26 09:55:36 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/SelectionInListView.st,v 1.278 2014-08-03 12:27:28 cg Exp $'
 !
 
 version_HG