[gwt-contrib] [google-web-toolkit commit] r4871 - releases/1.6/user/src/com/google/gwt/user/client/ui/impl

[codesite-noreply]

Author: j...@google.com
Date: Wed Feb 25 12:32:54 2009
New Revision: 4871

Modified:
     
releases/1.6/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java

Log:
Merging tr...@c4867 into the 1.6 release branch.


Modified:  
releases/1.6/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java
==============================================================================
---  
releases/1.6/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java  
 
(original)
+++  
releases/1.6/user/src/com/google/gwt/user/client/ui/impl/PopupImplMozilla.java  
 
Wed Feb 25 12:32:54 2009
@@ -48,12 +48,26 @@
    /**
     * Cache the value to avoid repeated calls.
     */
-  private static boolean isMac = isMac();
+  private static boolean isFF2Mac = isFF2Mac();

-  private static native boolean isMac() /*-{
-    if (navigator.userAgent.indexOf("Macintosh") != -1) {
-      return true;
-    }
+  private static native boolean isFF2Mac() /*-{
+    function makeVersion(result) {
+      return (parseInt(result[1]) * 1000) + parseInt(result[2]);
+    }
+
+    var ua = navigator.userAgent;
+    if (ua.indexOf("Macintosh") != -1) {
+      // Version logic taken from UserAgent.gwt.xml.
+      var result = /rv:([0-9]+)\.([0-9]+)/.exec(ua);
+      if (result && result.length == 3) {
+        // Gecko 1.8 and earlier had the scrollbar bug on OS X.
+        // (Firefox3 == Gecko 1.9)
+        if (makeVersion(result) <= 1008) {
+          return true;
+        }
+      }
+    }
+
      return false;
    }-*/;

@@ -61,7 +75,7 @@
    public Element createElement() {
      final Element outerElem = DOM.createDiv();

-    if (isMac) {
+    if (isFF2Mac) {
        // To solve the scrollbar rendering problem on the Mac, we have to  
make
        // the PopupPanel a 'heavyweight' element by setting a style of
        // 'overflow:auto' on the outermost div. This ensures that all of the
@@ -95,12 +109,12 @@

    @Override
    public Element getContainerElement(Element outerElem) {
-    return isMac ? DOM.getFirstChild(outerElem) : outerElem;
+    return isFF2Mac ? DOM.getFirstChild(outerElem) : outerElem;
    }

    @Override
    public Element getStyleElement(Element outerElem) {
-    return isMac ? outerElem : super.getStyleElement(outerElem);
+    return isFF2Mac ? outerElem : super.getStyleElement(outerElem);
    }

    @Override


--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---