From 4e9bd2a49142d3dd87f380b1f6e458734c566f7d Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 20 Dec 2011 10:11:58 +0000
Subject: #5655 Added getClientWidth() and getClientHeight() to WebBrowser and
 updated test

svn changeset:22453/svn branch:6.8
---
 .../gwt/server/AbstractApplicationPortlet.java     |  2 ++
 .../gwt/server/AbstractApplicationServlet.java     |  3 +-
 src/com/vaadin/terminal/gwt/server/WebBrowser.java | 38 ++++++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index 22f5cba1e6..acae039e8b 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -567,6 +567,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
             browser.updateClientSideDetails(
                     getHTTPRequestParameter(request, "sw"),
                     getHTTPRequestParameter(request, "sh"),
+                    getHTTPRequestParameter(request, "cw"),
+                    getHTTPRequestParameter(request, "ch"),
                     getHTTPRequestParameter(request, "tzo"),
                     getHTTPRequestParameter(request, "rtzo"),
                     getHTTPRequestParameter(request, "dstd"),
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 17b92db617..3957c84a71 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -595,7 +595,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
                 request.getHeader("user-agent"));
         if (request.getParameter("repaintAll") != null) {
             browser.updateClientSideDetails(request.getParameter("sw"),
-                    request.getParameter("sh"), request.getParameter("tzo"),
+                    request.getParameter("sh"), request.getParameter("cw"),
+                    request.getParameter("ch"), request.getParameter("tzo"),
                     request.getParameter("rtzo"), request.getParameter("dstd"),
                     request.getParameter("dston"),
                     request.getParameter("curdate"),
diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
index 9182ebdc03..cb83d93a72 100644
--- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java
+++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java
@@ -22,6 +22,8 @@ public class WebBrowser implements Terminal {
 
     private int screenHeight = 0;
     private int screenWidth = 0;
+    private int clientHeight = 0;
+    private int clientWidth = 0;
     private String browserApplication = null;
     private Locale locale;
     private String address;
@@ -62,6 +64,24 @@ public class WebBrowser implements Terminal {
         return screenWidth;
     }
 
+    /**
+     * Gets the height of the client (browser window)
+     * 
+     * @return The height of the client or 0 if unknown.
+     */
+    public int getClientHeight() {
+        return clientHeight;
+    }
+
+    /**
+     * Gets the width of the client (browser window)
+     * 
+     * @return The width of the client or 0 if unknown.
+     */
+    public int getClientWidth() {
+        return clientWidth;
+    }
+
     /**
      * Get the browser user-agent string.
      * 
@@ -312,6 +332,10 @@ public class WebBrowser implements Terminal {
      *            Screen width
      * @param sh
      *            Screen height
+     * @param cw
+     *            Client width
+     * @param ch
+     *            Client height
      * @param tzo
      *            TimeZone offset in minutes from GMT
      * @param rtzo
@@ -324,9 +348,9 @@ public class WebBrowser implements Terminal {
      *            the current date in milliseconds since the epoch
      * @param touchDevice
      */
-    void updateClientSideDetails(String sw, String sh, String tzo, String rtzo,
-            String dstSavings, String dstInEffect, String curDate,
-            boolean touchDevice) {
+    void updateClientSideDetails(String sw, String sh, String cw, String ch,
+            String tzo, String rtzo, String dstSavings, String dstInEffect,
+            String curDate, boolean touchDevice) {
         if (sw != null) {
             try {
                 screenHeight = Integer.parseInt(sh);
@@ -335,6 +359,14 @@ public class WebBrowser implements Terminal {
                 screenHeight = screenWidth = 0;
             }
         }
+        if (cw != null) {
+            try {
+                clientHeight = Integer.parseInt(ch);
+                clientWidth = Integer.parseInt(cw);
+            } catch (final NumberFormatException e) {
+                clientHeight = clientWidth = 0;
+            }
+        }
         if (tzo != null) {
             try {
                 // browser->java conversion: min->ms, reverse sign
-- 
cgit v1.2.3