Merge jv
authorMerge Script
Tue, 07 Jun 2016 06:40:31 +0200
branchjv
changeset 5130 436b5fa0e195
parent 5126 a6b40292f912 (current diff)
parent 5129 47cc569e96b7 (diff)
child 5132 10cfd15b629e
Merge
MenuPanel.st
--- a/.hgtags	Mon Jun 06 12:39:13 2016 +0100
+++ b/.hgtags	Tue Jun 07 06:40:31 2016 +0200
@@ -14,7 +14,6 @@
 51c444bfe5aeba5196e667b3c3834a96c27ca1f1 rel3_6_1
 532a328a9e0ec5da47acb16cdfeebebeed480c14 expecco_1_9_1_iX
 58b910fe451351b6f40e4ef2e5706a1f4ac486d7 expeccoALM_1_9_0_1
-5afe663f6f8d96274ec7809078c755d184e8125a expecco_2_9_0
 5cbf651bb214a2028e31d36a9d89eb2ed18e6f18 expecco_1_5_0
 5ea9411aaac82ef8a744a3dcdacb10d47f5523a2 expecco_1_7_1rc1
 5ea9411aaac82ef8a744a3dcdacb10d47f5523a2 expecco_1_7_1rc2
@@ -61,6 +60,8 @@
 bf524e69869d19a7e3e33e6b7624d8cf0b160b28 expecco_1_7_0rc8
 c5204a7261c1cfdef202bf34da8af0d17a35477a expecco_2_7_5
 c5204a7261c1cfdef202bf34da8af0d17a35477a expecco_2_7_5a
+d3bf0720d6b1667fb51b445434a9cdb59020102f expecco_2_9_0
+d3bf0720d6b1667fb51b445434a9cdb59020102f expecco_2_9_0_a
 db1c1a8e0384ee00c721cebb795639489d59c2e8 rel2_10_8_6_last_before_vmData_change
 df82e28ca88236402c737fe5a3606cd689836532 expecco_2_1_0
 e12757d015753c1a1124b536d83f41c043d9fff6 rel3_4_1_1
--- a/MenuPanel.st	Mon Jun 06 12:39:13 2016 +0100
+++ b/MenuPanel.st	Tue Jun 07 06:40:31 2016 +0200
@@ -8908,27 +8908,27 @@
 !
 
 isSelected:isSelected
-    "change selection to a state. Dependant on the state open or hide an existing
+    "change selection to a state. Depending on the state open or hide an existing
      submenu and perform a redraw"
 
     (isSelected and:[menuPanel notNil]) ifFalse:[
-	self invalidate.
-	self hideSubmenu.
-	^ self
+        self invalidate.
+        self hideSubmenu.
+        ^ self
     ].
 
     menuPanel realized ifFalse:[ ^ self ].
 
     (indication isNil or:[menuItem isButton not]) ifTrue:[
-	self invalidate
+        self invalidate
     ].
     self hasSubmenu ifFalse:[ ^ self].
 
     self hasDelayedMenu ifTrue:[
-	menuPanel openDelayed:self
+        menuPanel openDelayed:self
     ] ifFalse:[
-	self setupSubmenu.
-	subMenu notNil ifTrue:[ self openSubmenu ].
+        self setupSubmenu.
+        subMenu notNil ifTrue:[ self openSubmenu ].
     ].
 
     "Modified: / 07-11-2006 / 11:08:03 / cg"
--- a/NoteBookView.st	Mon Jun 06 12:39:13 2016 +0100
+++ b/NoteBookView.st	Tue Jun 07 06:40:31 2016 +0200
@@ -1001,7 +1001,7 @@
 !
 
 fitLastRow
-    "in case of true, the last row is expanded to the view  size like all
+    "in case of true, the last row is expanded to the view size like all
      other raws. In case of false all the tabs in the last raw keep their
      preferred extent (x or y) dependant on the direction.
     "
@@ -1009,7 +1009,7 @@
 !
 
 fitLastRow:aBool
-    "in case of true, the last row is expanded to the view  size like all
+    "in case of true, the last row is expanded to the view size like all
      other raws. In case of false all the tabs in the last raw keep their
      preferred extent (x or y) dependant on the direction.
     "