From 3e350d03c60a8c1c1d4744d24ac5c9400b6f6989 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 7 Oct 2013 05:42:10 +0000
Subject: [PATCH] If titlebar unlocked or window made full-screen, delay hiding
 titlebar until mouse moves away

---
 .../java/forge/gui/framework/SResizingUtil.java   | 15 +++++++++------
 src/main/java/forge/view/FNavigationBar.java      |  7 ++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/forge/gui/framework/SResizingUtil.java b/src/main/java/forge/gui/framework/SResizingUtil.java
index 5df2d06e2e1..c059b6dbbb5 100644
--- a/src/main/java/forge/gui/framework/SResizingUtil.java
+++ b/src/main/java/forge/gui/framework/SResizingUtil.java
@@ -131,14 +131,17 @@ public final class SResizingUtil {
         FAbsolutePositioner.SINGLETON_INSTANCE.containerResized(mainBounds);
         FOverlay.SINGLETON_INSTANCE.getPanel().setBounds(mainBounds);
         FNetOverlay.SINGLETON_INSTANCE.containerResized(mainBounds);
-        
-        final ForgePreferences prefs = Singletons.getModel().getPreferences();
-        final int navigationBarHeight = frame.isTitleBarHidden() ? 0 : navigationBar.getPreferredSize().height;
-        final int statusBarHeight = prefs.getPrefBoolean(FPref.UI_HIDE_STATUS_BAR) ? 0 : statusBar.getPreferredSize().height;
-        
+
+        int navigationBarHeight = navigationBar.getPreferredSize().height;
         navigationBar.setBounds(mainBounds.x, mainBounds.y, mainBounds.width, navigationBarHeight);
         navigationBar.validate();
-        
+
+        if (frame.isTitleBarHidden()) {
+            navigationBarHeight = 0; //use 0 for remaining calculations if title bar hidden
+        }
+        final ForgePreferences prefs = Singletons.getModel().getPreferences();
+        final int statusBarHeight = prefs.getPrefBoolean(FPref.UI_HIDE_STATUS_BAR) ? 0 : statusBar.getPreferredSize().height;
+
         pnlInsets.setBounds(mainBounds.x, mainBounds.y + navigationBarHeight, mainBounds.width, mainBounds.height - navigationBarHeight - statusBarHeight);
         pnlInsets.validate();
         
diff --git a/src/main/java/forge/view/FNavigationBar.java b/src/main/java/forge/view/FNavigationBar.java
index e7441fad3b7..ae4b2952b58 100644
--- a/src/main/java/forge/view/FNavigationBar.java
+++ b/src/main/java/forge/view/FNavigationBar.java
@@ -194,7 +194,12 @@ public class FNavigationBar extends FTitleBarBase {
             checkForRevealChangeTimer.stop();
             pnlReveal.setVisible(hidden);
         }
-        super.setVisible(visible);
+        if (visible || this.getHeight() < visibleHeight) {
+            super.setVisible(visible);
+        }
+        else if (pnlReveal != null) { //if previously fully visible, delay hiding titlebar until mouse moves away
+            checkForRevealChangeTimer.start();
+        }
     }
     
     @Override