[jbosstools-commits] JBoss Tools SVN: r37066 - in trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim: ui and 1 other directory.
Author: yradtsevich
Date: 2011-12-07 11:53:38 -0500 (Wed, 07 Dec 2011)
New Revision: 37066
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-10400: BrowserSim : the widow size issues
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2011-12-07
16:47:14 UTC (rev 37065)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/config/devices.cfg 2011-12-07
16:53:38 UTC (rev 37066)
@@ -1,5 +1,5 @@
-0
-PC (Default) -1 -1
+3
+Desktop (Default User-Agent) 1024 768
Apple iPad 2 768 1024 Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us)
AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5
Apple iPhone 3 320 480 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us)
AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
Apple iPhone 4 640 960 Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us)
AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2011-12-07
16:47:14 UTC (rev 37065)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2011-12-07
16:53:38 UTC (rev 37066)
@@ -424,7 +424,7 @@
private void setBrowserSize(int width, int height) {
GridData data = (GridData) browser.getLayoutData();
- Rectangle clientArea = display.getClientArea();
+ Rectangle clientArea = getMonitorClientArea();
int shellWidthHint = SWT.DEFAULT;
if (width != Device.DEFAULT_SIZE) {
data.widthHint = width;
@@ -463,6 +463,19 @@
shell.setBounds(shellBounds);
}
+
+ private Rectangle getMonitorClientArea() {
+ Rectangle clientArea = shell.getMonitor().getClientArea();
+
+ /* on Linux returned monitor client area may be bigger
+ * than the monitor bounds when multiple monitors are used.
+ * The following code fixes this */
+ Rectangle bounds = shell.getMonitor().getBounds();
+ clientArea.width = Math.min(clientArea.width, bounds.width);
+ clientArea.height = Math.min(clientArea.height, bounds.height);
+
+ return clientArea;
+ }
private void initOrientation(int orientation) {
browser.execute("window.onorientationchange = null;"