Title: [171839] branches/safari-600.1-branch/Source/WebCore
- Revision
- 171839
- Author
- [email protected]
- Date
- 2014-07-30 22:40:02 -0700 (Wed, 30 Jul 2014)
Log Message
Merged r171802. <rdar://problem/17199364>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171838 => 171839)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-31 05:38:30 UTC (rev 171838)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-31 05:40:02 UTC (rev 171839)
@@ -1,5 +1,23 @@
2014-07-30 Lucas Forschler <[email protected]>
+ Merge r171802
+
+ 2014-07-30 Dan Bernstein <[email protected]>
+
+ <rdar://problem/17199364> [Mac] Popup button arrows appear on the left, underlapping text, when the UI layout direction is right-to-left
+ https://bugs.webkit.org/show_bug.cgi?id=135426
+
+ Reviewed by Dean Jackson.
+
+ No test, because the UI layout direction in the test harness is always left-to-right.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::popupButton): Forced the user interface layout direction of the
+ NSPopUpButtonCell to left-to-right. Added a FIXME about how we could make this vary based on
+ the direction of the <select>, though that would require additional changes elsewhere.
+
+2014-07-30 Lucas Forschler <[email protected]>
+
Merge r171785
2014-07-29 Andreas Kling <[email protected]>
Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderThemeMac.mm (171838 => 171839)
--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderThemeMac.mm 2014-07-31 05:38:30 UTC (rev 171838)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderThemeMac.mm 2014-07-31 05:40:02 UTC (rev 171839)
@@ -1934,6 +1934,11 @@
m_popupButton = adoptNS([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
[m_popupButton.get() setUsesItemFromMenu:NO];
[m_popupButton.get() setFocusRingType:NSFocusRingTypeExterior];
+ // We don't want the app's UI layout direction to affect the appearance of popup buttons in
+ // web content, which has its own layout direction.
+ // FIXME: Make this depend on the directionality of the select element, once the rest of the
+ // rendering code can account for the popup arrows appearing on the other side.
+ [m_popupButton setUserInterfaceLayoutDirection:NSUserInterfaceLayoutDirectionLeftToRight];
}
return m_popupButton.get();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes