Changeset 41923 in webkit

Timestamp:

Mar 23, 2009 4:46:27 PM (15 years ago)

Author:

adachan@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=24762
Support text-indent in <option> elements on windows platform.

Reviewed by Adele Peterson.

• css/themeWin.css:
• platform/PopupMenuStyle.h: We don't honor font specified on <option> elements right now. Make this explicit via windows themed default stylesheet. (WebCore::PopupMenuStyle::PopupMenuStyle): Also store text-indent and text-direction. (WebCore::PopupMenuStyle::textIndent): (WebCore::PopupMenuStyle::textDirection):
• platform/win/PopupMenuWin.cpp: (WebCore::PopupMenu::paint): Adjust the text's x-coordinate if text-indent is supported for options and text-indent is specified with LTR direction.
• rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::updateOptionsWidth): Take text-indent into account if theme supports text-indent for options. (WebCore::RenderMenuList::itemStyle): Use new PopupMenuStyle constructor on windows. (WebCore::RenderMenuList::menuStyle): Ditto.
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::menuStyle): Ditto.
• rendering/RenderTheme.h: (WebCore::RenderTheme::popupOptionSupportsTextIndent): Added. Default is false since we are only supporting it in windows for now.
• rendering/RenderThemeWin.h: (WebCore::RenderThemeWin::popupOptionSupportsTextIndent): Returns true for windows.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/themeWin.css (modified) (1 diff)
• platform/PopupMenuStyle.h (modified) (4 diffs)
• platform/win/PopupMenuWin.cpp (modified) (1 diff)
• rendering/RenderMenuList.cpp (modified) (3 diffs)
• rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)
• rendering/RenderTheme.h (modified) (1 diff)
• rendering/RenderThemeWin.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-23  Ada Chan  <adachan@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=24762
+        Support text-indent in <option> elements on windows platform.
+
+        Reviewed by Adele Peterson.
+
+        * css/themeWin.css:
+        * platform/PopupMenuStyle.h: We don't honor font specified on <option> elements right now.  Make this
+        explicit via windows themed default stylesheet.
+        (WebCore::PopupMenuStyle::PopupMenuStyle): Also store text-indent and text-direction.
+        (WebCore::PopupMenuStyle::textIndent):
+        (WebCore::PopupMenuStyle::textDirection):
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::paint): Adjust the text's x-coordinate if text-indent is supported for options and 
+        text-indent is specified with LTR direction.
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::updateOptionsWidth): Take text-indent into account if theme supports text-indent for options.
+        (WebCore::RenderMenuList::itemStyle): Use new PopupMenuStyle constructor on windows.
+        (WebCore::RenderMenuList::menuStyle): Ditto.
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::menuStyle): Ditto.
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::popupOptionSupportsTextIndent): Added.  Default is false since we are only supporting it in windows for now.
+        * rendering/RenderThemeWin.h:
+        (WebCore::RenderThemeWin::popupOptionSupportsTextIndent): Returns true for windows.
+
 2009-03-23  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/css/themeWin.css

@@ -94 +94 @@
     margin: 0;
 }
+/* Options always use the selects' fonts */
+option {
+    font: inherit !important;
+}
 
 textarea {

trunk/WebCore/platform/PopupMenuStyle.h

@@ -29 +29 @@
 #include "Color.h"
 #include "Font.h"
+#include "Length.h"
+#include "TextDirection.h"
 
 namespace WebCore {
@@ -34 +36 @@
 class PopupMenuStyle {
 public:
-    PopupMenuStyle(const Color& foreground, const Color& background, const Font& font, bool visible)
+    PopupMenuStyle(const Color& foreground, const Color& background, const Font& font, bool visible, Length textIndent, TextDirection textDirection)
         : m_foregroundColor(foreground)
         , m_backgroundColor(background)
         , m_font(font)
         , m_visible(visible)
+        , m_textIndent(textIndent)
+        , m_textDirection(textDirection)
     {
     }
@@ -46 +50 @@
     const Font& font() const { return m_font; }
     bool isVisible() const { return m_visible; }
+    Length textIndent() const { return m_textIndent; }
+    TextDirection textDirection() const { return m_textDirection; }
 
 private:
@@ -52 +58 @@
     Font m_font;
     bool m_visible;
+    Length m_textIndent;
+    TextDirection m_textDirection;
 };
 

trunk/WebCore/platform/win/PopupMenuWin.cpp

@@ -528 +528 @@
         if (itemStyle.isVisible()) {
             int textX = max(0, client()->clientPaddingLeft() - client()->clientInsetLeft());
+            if (theme()->popupOptionSupportsTextIndent() && itemStyle.textDirection() == LTR)
+                textX += itemStyle.textIndent().calcMinValue(itemRect.width());
             int textY = itemRect.y() + itemFont.ascent() + (itemRect.height() - itemFont.height()) / 2;
             context.drawBidiText(itemFont, textRun, IntPoint(textX, textY));

trunk/WebCore/rendering/RenderMenuList.cpp

@@ -144 +144 @@
 
         String text = optionElement->textIndentedToRespectGroupLabel();
-        if (!text.isEmpty())
+        if (theme()->popupOptionSupportsTextIndent()) {
+            // Add in the option's text indent.  We can't calculate percentage values for now.
+            float optionWidth = 0;
+            if (RenderStyle* optionStyle = element->renderStyle())
+                optionWidth += optionStyle->textIndent().calcMinValue(0);
+            if (!text.isEmpty())
+                optionWidth += style()->font().floatWidth(text);
+            maxOptionWidth = max(maxOptionWidth, optionWidth);
+        } else if (!text.isEmpty())
             maxOptionWidth = max(maxOptionWidth, style()->font().floatWidth(text));
     }
@@ -333 +341 @@
     
     RenderStyle* style = element->renderStyle() ? element->renderStyle() : element->computedStyle();
-    return style ? PopupMenuStyle(style->color(), itemBackgroundColor(listIndex), style->font(), style->visibility() == VISIBLE) : menuStyle();
+    return style ? PopupMenuStyle(style->color(), itemBackgroundColor(listIndex), style->font(), style->visibility() == VISIBLE, style->textIndent(), style->direction()) : menuStyle();
 }
 
@@ -361 +369 @@
 
     RenderStyle* s = m_innerBlock ? m_innerBlock->style() : style();
-    return PopupMenuStyle(s->color(), s->backgroundColor(), s->font(), s->visibility() == VISIBLE);
+    return PopupMenuStyle(s->color(), s->backgroundColor(), s->font(), s->visibility() == VISIBLE, s->textIndent(), s->direction());
 }
 

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -693 +693 @@
 PopupMenuStyle RenderTextControlSingleLine::menuStyle() const
 {
-    return PopupMenuStyle(style()->color(), style()->backgroundColor(), style()->font(), style()->visibility() == VISIBLE);
+    return PopupMenuStyle(style()->color(), style()->backgroundColor(), style()->font(), style()->visibility() == VISIBLE, style()->textIndent(), style()->direction());
 }
 

trunk/WebCore/rendering/RenderTheme.h

@@ -136 +136 @@
     virtual int popupInternalPaddingTop(RenderStyle*) const { return 0; }
     virtual int popupInternalPaddingBottom(RenderStyle*) const { return 0; }
+    virtual bool popupOptionSupportsTextIndent() const { return false; }
 
     virtual int buttonInternalPaddingLeft() const { return 0; }

trunk/WebCore/rendering/RenderThemeWin.h

@@ -93 +93 @@
     virtual void adjustSliderThumbSize(RenderObject*) const;
 
+    virtual bool popupOptionSupportsTextIndent() const { return true; }
+
     virtual int buttonInternalPaddingLeft() const;
     virtual int buttonInternalPaddingRight() const;