Merge jv
authorMerge Script
Wed, 16 Nov 2016 06:42:54 +0100
branchjv
changeset 5329 2baf5daabd0e
parent 5327 111c6aed371e (current diff)
parent 5328 4285558b7c86 (diff)
child 5337 0a2b6f94bde9
Merge
MenuPanel.st
--- a/MenuPanel.st	Thu Nov 10 06:52:27 2016 +0100
+++ b/MenuPanel.st	Wed Nov 16 06:42:54 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1997 by eXept Software AG
 	      All Rights Reserved
@@ -5371,14 +5373,15 @@
 hasScrollerAt:aDirection
     "returns true if a visible scroller at a direction exists"
 
-    self hasScrollers ifTrue:[ |layout|
+    self hasScrollers ifTrue:[ |layout item|
         aDirection == #PREV ifTrue:[
-            layout := items first layout.
+            item   := items detect:[:each|(each layout notNil and:[each isVisible])] ifNone:[^ false ].
+            layout := item layout.
 
           ^ self verticalLayout ifTrue:[ layout top  < margin]
                                ifFalse:[ layout left < margin]
         ].
-        aDirection == #NEXT ifTrue:[ |item|
+        aDirection == #NEXT ifTrue:[
             "/ must check for visibility
             item   := items detectLast:[:each|(each layout notNil and:[each isVisible])] ifNone:[^ false ].
             layout := item layout.