Merge pull request #326 from Vennik/enhancement/overlay-hide

Add function for overlay hide.

Author: qurben

geex-core/src/main/java/nl/tudelft/context/controller/MainController.java

@@ -136,6 +136,22 @@ public final void setBaseView(final ViewController viewController) {
 
     }
 
+    /**
+     * Hide overlay.
+     *
+     * @return If overlay was shown.
+     */
+    public boolean hideOverlay() {
+
+        boolean visible = overlay.isVisible();
+        if (visible) {
+            menuController.getToggleOverlay().fire();
+        }
+
+        return visible;
+
+    }
+
     /**
      * Set a new main view and push it on the view stack.
      *
@@ -144,9 +160,7 @@ public final void setBaseView(final ViewController viewController) {
      */
     public void setView(final ViewController on, final ViewController viewController) {
 
-        if (overlay.isVisible()) {
-            menuController.getToggleOverlay().fire();
-        }
+        hideOverlay();
 
         if (shift || viewList.indexOf(on) == -1) {
 
@@ -181,11 +195,7 @@ private Stream<ViewController> getVisibleStream() {
      */
     public final void previousView() {
 
-        if (overlay.isVisible()) {
-
-            menuController.getToggleOverlay().fire();
-
-        } else {
+        if (!hideOverlay()) {
 
             getVisibleStream()
                     .skip(1)
@@ -205,6 +215,8 @@ public final void previousView() {
      */
     public void toView(final ViewController viewController) {
 
+        hideOverlay();
+
         int index = viewList.indexOf(viewController) + 1;
         viewList.stream()
                 .skip(index)