Cherry picking r9376 into release branch for issue #5722. git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.1@9377 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/cell/client/IconCellDecorator.java b/user/src/com/google/gwt/cell/client/IconCellDecorator.java index 3e0c7da..8f67fb1 100644 --- a/user/src/com/google/gwt/cell/client/IconCellDecorator.java +++ b/user/src/com/google/gwt/cell/client/IconCellDecorator.java
@@ -38,7 +38,7 @@ public class IconCellDecorator<C> implements Cell<C> { interface Template extends SafeHtmlTemplates { - @Template("<div style=\"position:relative;padding-{0}:{1}px;\">{2}<div>{3}</div></div>") + @Template("<div style=\"position:relative;padding-{0}:{1}px;zoom:1;\">{2}<div>{3}</div></div>") SafeHtml outerDiv(String direction, int width, SafeHtml icon, SafeHtml cellContents);
diff --git a/user/src/com/google/gwt/user/cellview/CellView.gwt.xml b/user/src/com/google/gwt/user/cellview/CellView.gwt.xml index d848672..00dacb0 100644 --- a/user/src/com/google/gwt/user/cellview/CellView.gwt.xml +++ b/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
@@ -54,12 +54,4 @@ <when-property-is name="user.agent" value="ie8"/> </any> </replace-with> - - <!-- IE6-specific CellTree implementation. --> - <replace-with class="com.google.gwt.user.cellview.client.CellTree.ImplIE6"> - <when-type-is class="com.google.gwt.user.cellview.client.CellTree.Impl"/> - <any> - <when-property-is name="user.agent" value="ie6"/> - </any> - </replace-with> </module>
diff --git a/user/src/com/google/gwt/user/cellview/client/CellBrowser.css b/user/src/com/google/gwt/user/cellview/client/CellBrowser.css index 8739e95..727930b 100644 --- a/user/src/com/google/gwt/user/cellview/client/CellBrowser.css +++ b/user/src/com/google/gwt/user/cellview/client/CellBrowser.css
@@ -27,10 +27,12 @@ .cellBrowserEvenItem { padding: 8px; + zoom: 1; } .cellBrowserOddItem { padding: 8px; + zoom: 1; } .cellBrowserKeyboardSelectedItem {
diff --git a/user/src/com/google/gwt/user/cellview/client/CellList.css b/user/src/com/google/gwt/user/cellview/client/CellList.css index cd7546e..48364d5 100644 --- a/user/src/com/google/gwt/user/cellview/client/CellList.css +++ b/user/src/com/google/gwt/user/cellview/client/CellList.css
@@ -19,10 +19,12 @@ .cellListEvenItem { cursor: pointer; + zoom: 1; } .cellListOddItem { cursor: pointer; + zoom: 1; } .cellListKeyboardSelectedItem {
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTree.css b/user/src/com/google/gwt/user/cellview/client/CellTree.css index 23c83d1..8d521c3 100644 --- a/user/src/com/google/gwt/user/cellview/client/CellTree.css +++ b/user/src/com/google/gwt/user/cellview/client/CellTree.css
@@ -27,6 +27,7 @@ padding-bottom: 4px; cursor: hand; cursor: pointer; + zoom: 1; } .cellTreeItemImage { @@ -34,7 +35,7 @@ } .cellTreeItemImageValue { - + zoom: 1; } .cellTreeItemValue {
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTree.java b/user/src/com/google/gwt/user/cellview/client/CellTree.java index 9460785..a3a7de6 100644 --- a/user/src/com/google/gwt/user/cellview/client/CellTree.java +++ b/user/src/com/google/gwt/user/cellview/client/CellTree.java
@@ -443,11 +443,6 @@ + "width:{2}px;height:{3}px;\">{4}</div>") SafeHtml imageWrapper(String classes, String direction, int width, int height, SafeHtml image); - - @Template("<div class=\"{0}\" style=\"position:absolute;{1}:-{2}px;" - + "width:{2}px;height:{3}px;\">{4}</div>") - SafeHtml imageWrapperIE6(String classes, String direction, int width, - int height, SafeHtml image); } /** @@ -464,30 +459,6 @@ } /** - * Implementation of {@link CellTable} used by IE6. - */ - @SuppressWarnings("unused") - private static class ImplIE6 extends Impl { - @Override - public SafeHtml imageWrapper(String classes, String direction, int width, - int height, SafeHtml image) { - /* - * In IE6, left/right positions are relative to the inside of the padding - * instead of the outside of the padding. The bug does not happen on IE7, - * which maps to the IE6 user agent, so we need a runtime check for IE6. - */ - if (isIe6()) { - return template.imageWrapperIE6(classes, direction, width, height, image); - } - return super.imageWrapper(classes, direction, width, height, image); - } - - private native boolean isIe6() /*-{ - return @com.google.gwt.dom.client.DOMImplIE6::isIE6()(); - }-*/; - } - - /** * The default number of children to show under a tree node. */ private static final int DEFAULT_LIST_SIZE = 25;
diff --git a/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css b/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css index f008a26..6ff00d7 100644 --- a/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css +++ b/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css
@@ -27,6 +27,7 @@ padding-bottom: 4px; cursor: hand; cursor: pointer; + zoom: 1; } .cellTreeItemImage { @@ -34,7 +35,7 @@ } .cellTreeItemImageValue { - + zoom: 1; } .cellTreeItemValue {
diff --git a/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java b/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java index 054b751..438bdf0 100644 --- a/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java +++ b/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java
@@ -67,7 +67,7 @@ cell.render(context, "helloworld", sb); // Compare the expected render string. - String expected = "<div style=\"position:relative;padding-left:64px;\">"; + String expected = "<div style=\"position:relative;padding-left:64px;zoom:1;\">"; expected += cell.getImageHtml(images.prettyPiccy(), HasVerticalAlignment.ALIGN_MIDDLE, true).asString(); expected += "<div>helloworld</div>"; @@ -123,7 +123,7 @@ @Override protected String getExpectedInnerHtml() { IconCellDecorator<String> cell = createCell(); - String html = "<div style=\"position:relative;padding-left:64px;\">"; + String html = "<div style=\"position:relative;padding-left:64px;zoom:1;\">"; html += cell.getIconHtml("helloworld").asString(); html += "<div>helloworld</div>"; html += "</div>"; @@ -133,7 +133,7 @@ @Override protected String getExpectedInnerHtmlNull() { IconCellDecorator<String> cell = createCell(); - String html = "<div style=\"position:relative;padding-left:64px;\">"; + String html = "<div style=\"position:relative;padding-left:64px;zoom:1;\">"; html += cell.getIconHtml("helloworld").asString(); html += "<div></div>"; html += "</div>";