Merge jv
authorMerge Script
Thu, 10 Nov 2016 06:52:27 +0100
branchjv
changeset 5327 111c6aed371e
parent 5323 be6a1f522092 (current diff)
parent 5326 cd7b51c4248c (diff)
child 5329 2baf5daabd0e
Merge
DoWhatIMeanSupport.st
--- a/AbstractHierarchicalItem.st	Wed Nov 09 07:03:34 2016 +0100
+++ b/AbstractHierarchicalItem.st	Thu Nov 10 06:52:27 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1999/2015 by eXept Software AG
               All Rights Reserved
@@ -1571,7 +1573,7 @@
     label := self label.
     label isNil ifTrue:[^ self].
 
-    (label isString or:[label isSequenceable not]) ifTrue:[
+    label isNonByteCollection ifFalse:[
         ^ self displayLabel:label h:(self heightOn:aGC) on:aGC x:x y:y h:h isHighlightedAsSelected:isHighlightedAsSelected
     ].
 
--- a/DataSetView.st	Wed Nov 09 07:03:34 2016 +0100
+++ b/DataSetView.st	Thu Nov 10 06:52:27 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libwidg2' }"
 
+"{ NameSpace: Smalltalk }"
+
 ScrollableView subclass:#DataSetView
 	instanceVariableNames:'labelView rememberedTopOffsetOfScrolledView'
 	classVariableNames:''
@@ -379,6 +381,18 @@
         labelView containerChangedSize.
     ].
     super scrolledViewLayout:modifiedLayout
+!
+
+verticalScrollBarLayout:aLayout
+    "redefined to care for the label view, 
+     which is at the top and NOT scrolled.
+     It covers the top areay of myself, so we have to make the vertical
+     scrollbar a little smaller."
+
+    labelView notNil ifTrue:[
+        aLayout topOffset:(aLayout topOffset + labelView height).
+    ].    
+    super verticalScrollBarLayout:aLayout
 ! !
 
 !DataSetView methodsFor:'queries'!
@@ -419,6 +433,6 @@
 !DataSetView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DataSetView.st,v 1.47 2014-02-05 10:06:06 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/DoWhatIMeanSupport.st	Wed Nov 09 07:03:34 2016 +0100
+++ b/DoWhatIMeanSupport.st	Thu Nov 10 06:52:27 2016 +0100
@@ -5505,7 +5505,7 @@
         ]
     ].
     
-    "/ the selector beeing comleted must be ignored here
+    "/ the selector being completed must be ignored here
     (varNode parent notNil and:[varNode parent isMessage]) ifTrue:[
         allSelectors remove:(varNode parent selector) ifAbsent:[].
     ].