Changeset 86070 in webkit

Timestamp:

May 9, 2011 11:20:35 AM (13 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier.

[wx] Make sure other controls adjust the rect to handle transforms, and turn off the
adjustment in 2.9.2+ where it is handled internally by wx.

Also add a couple drawing and focus handling fixes for text fields and menulist controls.

​https://bugs.webkit.org/show_bug.cgi?id=60481

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/wx/RenderThemeWx.cpp (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-09  Robin Dunn  <robin@alldunn.com>
+
+        Reviewed by Kevin Ollivier.
+
+        [wx] Make sure other controls adjust the rect to handle transforms, and turn off the
+        adjustment in 2.9.2+ where it is handled internally by wx.
+        
+        Also add a couple drawing and focus handling fixes for text fields and menulist controls.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=60481
+
+        * platform/wx/RenderThemeWx.cpp:
+        (WebCore::getAdjustedRect):
+        (WebCore::RenderThemeWx::supportsFocus):
+        (WebCore::RenderThemeWx::paintButton):
+        (WebCore::RenderThemeWx::adjustTextFieldStyle):
+        (WebCore::RenderThemeWx::paintTextField):
+        (WebCore::RenderThemeWx::adjustMenuListStyle):
+        (WebCore::RenderThemeWx::paintMenuList):
+        (WebCore::RenderThemeWx::paintMenuListButton):
+
 2011-05-09  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/Source/WebCore/platform/wx/RenderThemeWx.cpp

@@ -46 +46 @@
 namespace WebCore {
 
+IntRect getAdjustedRect(wxDC* dc, const IntRect& r)
+{
+    IntRect rect = r;
+// On Mac, wxGraphicsContext and wxDC share the same native implementation,
+// and so transformations are available.
+// On Win and Linux, however, this is not true and transforms are lost,
+// so we need to restore them here.
+#if !wxCHECK_VERSION(2, 9, 2) && USE(WXGC) && !defined(__WXMAC__)
+    LOG_ERROR("Rect is (%d, %d)\n", rect.x(), rect.y());
+    double xtrans = 0;
+    double ytrans = 0;
+    
+    wxGCDC* gcdc = static_cast<wxGCDC*>(dc);
+    wxGraphicsContext* gc = gcdc->GetGraphicsContext();
+    gc->GetTransform().TransformPoint(&xtrans, &ytrans);
+    rect.setX(r.x() + (int)xtrans);
+    rect.setY(r.y() + (int)ytrans);
+    LOG_ERROR("Transform is (%f, %f), (%d, %d)\n", xtrans, ytrans, rect.x(), rect.y());
+#endif
+
+    return rect;
+}
+
 class RenderThemeWx : public RenderTheme {
 private:
@@ -250 +273 @@
         case ButtonPart:
         case TextFieldPart:
+        case MenulistPart:
             return true;
         default: // No for all others...
@@ -267 +291 @@
     int flags = 0;
     
-    IntRect rect = r; 
-
-// On Mac, wxGraphicsContext and wxDC share the same native implementation,
-// and so transformations are available.
-// On Win and Linux, however, this is not true and transforms are lost,
-// so we need to restore them here.
-#if USE(WXGC) && !defined(__WXMAC__)
-    double xtrans = 0;
-    double ytrans = 0;
-    
-    wxGCDC* gcdc = static_cast<wxGCDC*>(dc);
-    wxGraphicsContext* gc = gcdc->GetGraphicsContext();
-    gc->GetTransform().TransformPoint(&xtrans, &ytrans);
-    rect.setX(r.x() + (int)xtrans);
-    rect.setY(r.y() + (int)ytrans);
-#endif
+    IntRect rect = getAdjustedRect(dc, r);
 
     if (!isEnabled(o))
@@ -317 +326 @@
 void RenderThemeWx::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
-    
+
 }
 
@@ -324 +333 @@
     wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
+    int flags = 0;
+    
+    IntRect rect = getAdjustedRect(dc, r);
+
+    ControlPart part = o->style()->appearance();
+    if (supportsFocus(part) && isFocused(o))
+        flags |= wxCONTROL_FOCUSED;
+
 #if wxCHECK_VERSION(2,9,0)
-    wxRendererNative::Get().DrawTextCtrl(window, *dc, r, 0);
+    wxRendererNative::Get().DrawTextCtrl(window, *dc, rect, flags);
 #else
     wxRenderer_DrawTextCtrl(window, *dc, r, 0);
@@ -340 +357 @@
 void RenderThemeWx::adjustMenuListStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
+     style->resetBorder();
+
+    // Height is locked to auto.
+    style->setHeight(Length(Auto));
+    
+    style->setPaddingTop(Length(2, Fixed));
+    style->setPaddingBottom(Length(2, Fixed));
 }
     
@@ -346 +370 @@
     wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
-    
+ 
+    IntRect rect = getAdjustedRect(dc, r);
+
     int flags = 0;      
     if (!isEnabled(o))
@@ -358 +384 @@
 
 #if wxCHECK_VERSION(2,9,0)
-    wxRendererNative::Get().DrawChoice(window, *dc, r, flags);
-#else
-    wxRenderer_DrawChoice(window, *dc, r, flags);
+    wxRendererNative::Get().DrawChoice(window, *dc, rect, flags);
+#else
+    wxRenderer_DrawChoice(window, *dc, rect, flags);
 #endif
 
@@ -375 +401 @@
     wxWindow* window = nativeWindowForRenderObject(o);
     wxDC* dc = static_cast<wxDC*>(i.context->platformContext());
-    
+
+    IntRect rect = getAdjustedRect(dc, r);
+
     int flags = 0;      
     if (!isEnabled(o))
@@ -386 +414 @@
         flags |= wxCONTROL_PRESSED;
 
-    wxRendererNative::Get().DrawComboBoxDropButton(window, *dc, r, flags);
+    wxRendererNative::Get().DrawComboBoxDropButton(window, *dc, rect, flags);
             
     return false;