From 0c1260aa326e90dd771b1acb1b719fd81922880f Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 8 Apr 2012 17:17:38 -0700
Subject: [PATCH] Fix touch button rendering.

---
 guacamole/src/main/webapp/client.xhtml         | 6 +-----
 guacamole/src/main/webapp/scripts/interface.js | 1 +
 guacamole/src/main/webapp/styles/client.css    | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index 312d3c3de..7c38668ac 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -85,11 +85,7 @@
         </div>
 
         <!-- Touch-specific menu -->
-        <div id="touchMenu">
-            <img id="touchShowClipboard" src="images/menu-icons/tango/edit-paste.png"/>
-            <img id="touchShowKeyboard" src="images/menu-icons/tango/input-keyboard.png"/>
-            <img id="touchLogout" src="images/menu-icons/tango/system-log-out.png"/>
-        </div>
+        <div id="touchMenu"><img id="touchShowClipboard" src="images/menu-icons/tango/edit-paste.png"/><img id="touchShowKeyboard" src="images/menu-icons/tango/input-keyboard.png"/><img id="touchLogout" src="images/menu-icons/tango/system-log-out.png"/></div>
 
         <!-- guacamole-common-js scripts -->
         <script type="text/javascript" src="guacamole-common-js/keyboard.js"></script>
diff --git a/guacamole/src/main/webapp/scripts/interface.js b/guacamole/src/main/webapp/scripts/interface.js
index 4f897b8ef..b3681db3e 100644
--- a/guacamole/src/main/webapp/scripts/interface.js
+++ b/guacamole/src/main/webapp/scripts/interface.js
@@ -297,6 +297,7 @@ var GuacamoleUI = {
     GuacamoleUI.buttons.touchLogout.onclick =
         function() {
             window.location.href = "logout";
+            GuacamoleUI.hideTouchMenu();
         };
 
     // Timeouts for detecting if users wants menu to open or close
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index 7477dd88b..f595297c0 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -264,7 +264,7 @@ div#touchMenu {
     position: absolute;
     visibility: hidden;
     
-    display: inline-block;
+    white-space: pre;
     background: black;
     border: 1px solid silver;
     padding: 1em;