From ce78aaeb78cf7e48e91a8e76ecb5f48531baea6c Mon Sep 17 00:00:00 2001
From: Automerge <automerge@vaadin.com>
Date: Thu, 24 May 2012 11:06:04 +0000
Subject: [merge from 6.7] #8801 Recompute VFilterSelect textbox width if popup
 opener width has changed eg. due to a style/theme change

svn changeset:23823/svn branch:6.8
---
 src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 8362d6fbec..4ecb42d920 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1237,6 +1237,12 @@ public class VFilterSelect extends Composite implements Paintable, Field,
             updateRootWidth();
         }
 
+        // Popup opener width may have changed due to a style change (#8801)
+        if (!readonly && popupWidth != Util.getRequiredWidth(popupOpener)) {
+            popupWidth = Util.getRequiredWidth(popupOpener);
+            updateRootWidth();
+        }
+
         // Focus dependent style names are lost during the update, so we add
         // them here back again
         if (focused) {
-- 
cgit v1.2.3


From 20ba0f58a0649702cfa5442d7c192c74d03b6a36 Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 24 May 2012 13:16:02 +0000
Subject: Manual merge from 6.7 to 6.8 for #8799 timer unregistration.

svn changeset:23825/svn branch:6.8
---
 src/com/vaadin/terminal/gwt/client/ui/VView.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src')

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java
index 350c4b206b..6fdacc9607 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java
@@ -136,7 +136,14 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
         // should not be in the document focus flow
         getElement().setTabIndex(-1);
         TouchScrollDelegate.enableTouchScrolling(this, getElement());
+    }
 
+    /**
+     * Start to periodically monitor for parent element resizes if embedded
+     * application (e.g. portlet).
+     */
+    protected void onLoad() {
+        super.onLoad();
         if (isMonitoringParentSize()) {
             resizeTimer = new Timer() {
                 @Override
@@ -151,6 +158,18 @@ public class VView extends SimplePanel implements Container, ResizeHandler,
         }
     }
 
+    /**
+     * Stop monitoring for parent element resizes.
+     */
+    @Override
+    protected void onUnload() {
+        if (resizeTimer != null) {
+            resizeTimer.cancel();
+            resizeTimer = null;
+        }
+        super.onUnload();
+    }
+
     /**
      * Called when the window or parent div might have been resized.
      * 
-- 
cgit v1.2.3


From cac340e3dda0c4ec68af5294df84d428ffd5d30d Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannes.dahlstrom@vaadin.com>
Date: Fri, 25 May 2012 12:35:28 +0000
Subject: #7911 Added a common CSS class "v-touch" for all touch devices

svn changeset:23828/svn branch:6.8
---
 src/com/vaadin/terminal/gwt/client/BrowserInfo.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
index c8caab6829..4b9f3eacab 100644
--- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
@@ -33,6 +33,9 @@ public class BrowserInfo {
     private static final String OS_ANDROID = "android";
     private static final String OS_IOS = "ios";
 
+    // Common CSS class for all touch devices
+    private static final String UI_TOUCH = "touch";
+
     private static BrowserInfo instance;
 
     private static String cssClass = null;
@@ -171,7 +174,9 @@ public class BrowserInfo {
             if (osClass != null) {
                 cssClass = cssClass + " " + prefix + osClass;
             }
-
+            if (isTouchDevice()) {
+                cssClass = cssClass + " " + prefix + UI_TOUCH;
+            }
         }
 
         return cssClass;
-- 
cgit v1.2.3