litesoft
Diff Revisions
947
vs
948
for /trunk/Java/GWT/Client/src/com/google/gwt/widgetideas/client/impl/GlassPanelImplIE6.java
|
@@ -22,21 +22,18 @@ |
22 |
22 |
|
/** |
23 |
23 |
|
* IE6 implementation of {@link GlassPanelImpl}. |
24 |
24 |
|
*/ |
25 |
|
- |
public class GlassPanelImplIE6 extends GlassPanelImpl |
26 |
|
- |
{ |
|
25 |
+ |
public class GlassPanelImplIE6 extends GlassPanelImpl { |
27 |
26 |
|
private int lastDocumentClientWidth = -1; |
28 |
27 |
|
private int lastDocumentClientHeight = -1; |
29 |
28 |
|
|
30 |
29 |
|
@Override |
31 |
|
- |
public void matchDocumentSize( GlassPanel glassPanel, boolean dueToResize ) |
32 |
|
- |
{ |
|
30 |
+ |
public void matchDocumentSize( GlassPanel glassPanel, boolean dueToResize ) { |
33 |
31 |
|
int clientWidth = Window.getClientWidth(); |
34 |
32 |
|
int clientHeight = Window.getClientHeight(); |
35 |
33 |
|
|
36 |
34 |
|
// Workaround for issue 1934 |
37 |
35 |
|
// IE fires Window onresize events when the size of the body changes |
38 |
|
- |
if ( !dueToResize || clientWidth != lastDocumentClientWidth || clientHeight != lastDocumentClientHeight ) |
39 |
|
- |
{ |
|
36 |
+ |
if ( !dueToResize || clientWidth != lastDocumentClientWidth || clientHeight != lastDocumentClientHeight ) { |
40 |
37 |
|
int offsetWidth = RootPanel.get().getOffsetWidth(); |
41 |
38 |
|
int offsetHeight = RootPanel.get().getOffsetHeight(); |
42 |
39 |
|
|
|
@@ -53,14 +50,10 @@ |
53 |
50 |
|
} |
54 |
51 |
|
|
55 |
52 |
|
@Override |
56 |
|
- |
public final void matchParentSize( final GlassPanel glassPanel, final AbsolutePanel parent ) |
57 |
|
- |
{ |
58 |
|
- |
if ( isCSS1Compat() ) |
59 |
|
- |
{ |
|
53 |
+ |
public final void matchParentSize( final GlassPanel glassPanel, final AbsolutePanel parent ) { |
|
54 |
+ |
if ( isCSS1Compat() ) { |
60 |
55 |
|
super.matchParentSize( glassPanel, parent ); |
61 |
|
- |
} |
62 |
|
- |
else |
63 |
|
- |
{ |
|
56 |
+ |
} else { |
64 |
57 |
|
// less than perfect due to parent borders, but works around other buggy size issues |
65 |
58 |
|
glassPanel.setPixelSize( parent.getOffsetWidth(), parent.getOffsetHeight() ); |
66 |
59 |
|
} |