Merge jv
authorMerge Script
Fri, 09 Oct 2015 06:49:45 +0200
branchjv
changeset 5474 72868017b4f4
parent 5472 b72befba5c7a (current diff)
parent 5473 5723b596e1cf (diff)
child 5479 67f5339f0f47
Merge
--- a/VariablePanel.st	Thu Oct 08 06:56:50 2015 +0200
+++ b/VariablePanel.st	Fri Oct 09 06:49:45 2015 +0200
@@ -1114,7 +1114,7 @@
 !
 
 orientation:aSymbol
-    "change  my orientation; aSymbol must be one of #horizontal or #vertical.
+    "change my orientation; aSymbol must be one of #horizontal or #vertical.
      Changing implies a resize of my subViews."
 
     aSymbol ~~ orientation ifTrue:[
@@ -1173,14 +1173,19 @@
 setBarHeight:nPixel
     "check whether snap matches to extent of bar otherwise disable snap"
 
+    |newBarHeight|
+    
     snapAdornment notNil ifTrue:[
-        barHeight := nPixel max:(snapAdornment height ? 0)
+        newBarHeight := nPixel max:(snapAdornment height ? 0)
     ] ifFalse:[
-        barHeight := nPixel max:0
+        newBarHeight := nPixel max:0
     ].
-
-    realized ifTrue:[
-        self resizeSubviews
+    newBarHeight := newBarHeight max:(styleSheet at:#'variablePanel.minBarHeight' default:newBarHeight).
+    newBarHeight ~= barHeight ifTrue:[
+        barHeight := newBarHeight.
+        realized ifTrue:[
+            self resizeSubviews
+        ]
     ]
 
     "Modified: / 31-10-2010 / 13:00:06 / cg"
@@ -1296,6 +1301,10 @@
 
         oldHeight ~~ barHeight ifTrue:[
             "must recompute subViews"
+"/            realized ifFalse:[
+"/                needResize := true.
+"/                ^ self.
+"/            ].
             self setupSubviews.
             self resizeSubviews.
         ]
@@ -1990,6 +1999,8 @@
             barWidth := (1.5 * mm) rounded. "motif style width"
         ].
     ].
+    barWidth := styleSheet at:#'variablePanel.barWidth' default:barWidth.
+    
     self computeBarHeight.
 
     handleStyle == #mswindows ifTrue:[
@@ -2004,6 +2015,7 @@
     super initialize.
     self bitGravity:nil.
 
+    
     "Modified: / 29.7.1998 / 16:07:23 / cg"
 ! !