Browse Source

Remove clientHeight/Width from WebBrowser (#5655)

svn changeset:23792/svn branch:6.8
tags/7.0.0.alpha3
Leif Åstrand 12 years ago
parent
commit
e7f31596e7

+ 0
- 2
src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java View File

browser.updateClientSideDetails( browser.updateClientSideDetails(
getHTTPRequestParameter(request, "sw"), getHTTPRequestParameter(request, "sw"),
getHTTPRequestParameter(request, "sh"), getHTTPRequestParameter(request, "sh"),
getHTTPRequestParameter(request, "cw"),
getHTTPRequestParameter(request, "ch"),
getHTTPRequestParameter(request, "tzo"), getHTTPRequestParameter(request, "tzo"),
getHTTPRequestParameter(request, "rtzo"), getHTTPRequestParameter(request, "rtzo"),
getHTTPRequestParameter(request, "dstd"), getHTTPRequestParameter(request, "dstd"),

+ 1
- 2
src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java View File

request.getHeader("user-agent")); request.getHeader("user-agent"));
if (request.getParameter("repaintAll") != null) { if (request.getParameter("repaintAll") != null) {
browser.updateClientSideDetails(request.getParameter("sw"), browser.updateClientSideDetails(request.getParameter("sw"),
request.getParameter("sh"), request.getParameter("cw"),
request.getParameter("ch"), request.getParameter("tzo"),
request.getParameter("sh"), request.getParameter("tzo"),
request.getParameter("rtzo"), request.getParameter("dstd"), request.getParameter("rtzo"), request.getParameter("dstd"),
request.getParameter("dston"), request.getParameter("dston"),
request.getParameter("curdate"), request.getParameter("curdate"),

+ 3
- 41
src/com/vaadin/terminal/gwt/server/WebBrowser.java View File



private int screenHeight = 0; private int screenHeight = 0;
private int screenWidth = 0; private int screenWidth = 0;
private int clientHeight = 0;
private int clientWidth = 0;
private String browserApplication = null; private String browserApplication = null;
private Locale locale; private Locale locale;
private String address; private String address;
return screenWidth; return screenWidth;
} }


/**
* Gets the height of the client (browser window).
* <p>
* Note that the client size is only updated on a full repaint, not when the
* browser window size changes
*
* @return The height of the client or 0 if unknown.
*/
public int getClientHeight() {
return clientHeight;
}

/**
* Gets the width of the client (browser window)
* <p>
* Note that the client size is only updated on a full repaint, not when the
* browser window size changes
*
* @return The width of the client or 0 if unknown.
*/
public int getClientWidth() {
return clientWidth;
}

/** /**
* Get the browser user-agent string. * Get the browser user-agent string.
* *
* Screen width * Screen width
* @param sh * @param sh
* Screen height * Screen height
* @param cw
* Client width
* @param ch
* Client height
* @param tzo * @param tzo
* TimeZone offset in minutes from GMT * TimeZone offset in minutes from GMT
* @param rtzo * @param rtzo
* the current date in milliseconds since the epoch * the current date in milliseconds since the epoch
* @param touchDevice * @param touchDevice
*/ */
void updateClientSideDetails(String sw, String sh, String cw, String ch,
String tzo, String rtzo, String dstSavings, String dstInEffect,
String curDate, boolean touchDevice) {
void updateClientSideDetails(String sw, String sh, String tzo, String rtzo,
String dstSavings, String dstInEffect, String curDate,
boolean touchDevice) {
if (sw != null) { if (sw != null) {
try { try {
screenHeight = Integer.parseInt(sh); screenHeight = Integer.parseInt(sh);
screenHeight = screenWidth = 0; 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) { if (tzo != null) {
try { try {
// browser->java conversion: min->ms, reverse sign // browser->java conversion: min->ms, reverse sign

+ 4
- 2
tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java View File

public void buttonClick(ClickEvent event) { public void buttonClick(ClickEvent event) {
screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x " screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x "
+ getBrowser().getScreenHeight()); + getBrowser().getScreenHeight());
browserSizeLabel.setValue(getBrowser().getClientWidth() + " x "
+ getBrowser().getClientHeight());
browserSizeLabel.setValue(getMainWindow()
.getBrowserWindowWidth()
+ " x "
+ getMainWindow().getBrowserWindowHeight());
} }
}); });



Loading…
Cancel
Save