Changeset 63179 in webkit

Timestamp:

Jul 12, 2010 11:41:09 PM (14 years ago)

Author:

jcivelli@chromium.org

Message:

2010-07-12 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Kent Tamura.

Adding right aligned text called labels to PopupMenus.
​https://bugs.webkit.org/show_bug.cgi?id=41964

• platform/PopupMenuClient.h:
• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::paintRow):
• rendering/RenderMenuList.cpp: (WebCore::RenderMenuList::itemLabel):
• rendering/RenderMenuList.h:
• rendering/RenderTextControlSingleLine.cpp: (WebCore::RenderTextControlSingleLine::itemLabel):
• rendering/RenderTextControlSingleLine.h:

2010-07-12 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Kent Tamura.

Making the autofill popup use labels to show the label
associated with an item.
​https://bugs.webkit.org/show_bug.cgi?id=41964

• src/AutoFillPopupMenuClient.cpp: (WebKit::AutoFillPopupMenuClient::getSuggestion): (WebKit::AutoFillPopupMenuClient::getLabel): (WebKit::AutoFillPopupMenuClient::itemLabel): (WebKit::AutoFillPopupMenuClient::setSuggestions): (WebKit::AutoFillPopupMenuClient::convertListIndexToInternalIndex):
• src/AutoFillPopupMenuClient.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PopupMenuClient.h (modified) (1 diff)
• WebCore/platform/chromium/PopupMenuChromium.cpp (modified) (3 diffs)
• WebCore/rendering/RenderMenuList.cpp (modified) (1 diff)
• WebCore/rendering/RenderMenuList.h (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)
• WebCore/rendering/RenderTextControlSingleLine.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/AutoFillPopupMenuClient.cpp (modified) (3 diffs)
• WebKit/chromium/src/AutoFillPopupMenuClient.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-12  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Adding right aligned text called labels to PopupMenus.
+        https://bugs.webkit.org/show_bug.cgi?id=41964
+
+        * platform/PopupMenuClient.h:
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::paintRow):
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::itemLabel):
+        * rendering/RenderMenuList.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::itemLabel):
+        * rendering/RenderTextControlSingleLine.h:
+
 2010-07-12  Mihnea Ovidenea  <mihnea@adobe.com>
 

trunk/WebCore/platform/PopupMenuClient.h

@@ -43 +43 @@
 
     virtual String itemText(unsigned listIndex) const = 0;
+    virtual String itemLabel(unsigned listIndex) const = 0;
     virtual String itemToolTip(unsigned listIndex) const = 0;
     virtual String itemAccessibilityText(unsigned listIndex) const = 0;

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -71 +71 @@
 static const int kMaxHeight = 500;
 static const int kBorderSize = 1;
+static const int kTextToLabelPadding = 10;
 static const TimeStamp kTypeAheadTimeoutMs = 1000;
 
@@ -918 +919 @@
     // Prepare text to be drawn.
     String itemText = m_popupClient->itemText(rowIndex);
-    if (m_settings.restrictWidthOfListBox)  // truncate string to fit in.
-        itemText = StringTruncator::rightTruncate(itemText, maxWidth, itemFont);
-    unsigned length = itemText.length();
-    const UChar* str = itemText.characters();
+    String itemLabel = m_popupClient->itemLabel(rowIndex);
+    if (m_settings.restrictWidthOfListBox) { // Truncate strings to fit in.
+        // FIXME: We should leftTruncate for the rtl case.
+        // StringTruncator::leftTruncate would have to be implemented.
+        String str = StringTruncator::rightTruncate(itemText, maxWidth, itemFont);
+        if (str != itemText) {
+            itemText = str;
+            // Don't display the label, we already don't have enough room for the
+            // item text.
+            itemLabel = "";
+        } else if (!itemLabel.isEmpty()) {
+            int availableWidth = maxWidth - kTextToLabelPadding -
+                StringTruncator::width(itemText, itemFont);
+            itemLabel = StringTruncator::rightTruncate(itemLabel, availableWidth, itemFont);
+        }
+    }
+
     // Prepare the directionality to draw text.
     bool rtl = false;
@@ -929 +943 @@
              PopupContainerSettings::FirstStrongDirectionalCharacterDirection)
         rtl = itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft;
-    TextRun textRun(str, length, false, 0, 0, rtl);
+    TextRun textRun(itemText.characters(), itemText.length(), false, 0, 0, rtl);
     // If the text is right-to-left, make it right-aligned by adjusting its
     // beginning position.
     if (rightAligned)
         textX += maxWidth - itemFont.width(textRun);
+
     // Draw the item text.
     int textY = rowRect.y() + itemFont.ascent() + (rowRect.height() - itemFont.height()) / 2;
     gc->drawBidiText(itemFont, textRun, IntPoint(textX, textY));
+
+    // Draw the the label if applicable.
+    if (itemLabel.isEmpty())
+        return;
+    TextRun labelTextRun(itemLabel.characters(), itemLabel.length(), false, 0, 0, rtl);
+    if (rightAligned)
+        textX = max(0, m_popupClient->clientPaddingLeft() - m_popupClient->clientInsetLeft());
+    else {
+        // We are using the left padding as the right padding includes room for the scroll-bar which
+        // does not show in this case.
+        int rightPadding = max(0, m_popupClient->clientPaddingLeft() - m_popupClient->clientInsetLeft());
+        textX = rowRect.width() - rightPadding - itemFont.width(labelTextRun);
+    }
+
+    // FIXME: for now the label color is hard-coded. It should be added to the
+    //        PopupMenuStyle.
+    gc->setFillColor(Color(115, 115, 115), DeviceColorSpace);
+    gc->drawBidiText(itemFont, labelTextRun, IntPoint(textX, textY));
 }
 

trunk/WebCore/rendering/RenderMenuList.cpp

@@ -351 +351 @@
 }
 
+String RenderMenuList::itemLabel(unsigned) const
+{
+    return String();
+}
+
 String RenderMenuList::itemAccessibilityText(unsigned listIndex) const
 {

trunk/WebCore/rendering/RenderMenuList.h

@@ -83 +83 @@
     // PopupMenuClient methods
     virtual String itemText(unsigned listIndex) const;
+    virtual String itemLabel(unsigned listIndex) const;
     virtual String itemToolTip(unsigned listIndex) const;
     virtual String itemAccessibilityText(unsigned listIndex) const;

trunk/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -877 +877 @@
 }
 
+String RenderTextControlSingleLine::itemLabel(unsigned) const
+{
+    return String();
+}
+
 bool RenderTextControlSingleLine::itemIsEnabled(unsigned listIndex) const
 {

trunk/WebCore/rendering/RenderTextControlSingleLine.h

@@ -116 +116 @@
     virtual void selectionCleared() {}
     virtual String itemText(unsigned listIndex) const;
+    virtual String itemLabel(unsigned listIndex) const;
     virtual String itemToolTip(unsigned) const { return String(); }
     virtual String itemAccessibilityText(unsigned) const { return String(); }

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-12  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Making the autofill popup use labels to show the label
+        associated with an item.
+        https://bugs.webkit.org/show_bug.cgi?id=41964
+
+        * src/AutoFillPopupMenuClient.cpp:
+        (WebKit::AutoFillPopupMenuClient::getSuggestion):
+        (WebKit::AutoFillPopupMenuClient::getLabel):
+        (WebKit::AutoFillPopupMenuClient::itemLabel):
+        (WebKit::AutoFillPopupMenuClient::setSuggestions):
+        (WebKit::AutoFillPopupMenuClient::convertListIndexToInternalIndex):
+        * src/AutoFillPopupMenuClient.h:
+
 2010-07-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.cpp

@@ -67 +67 @@
 WebString AutoFillPopupMenuClient::getSuggestion(unsigned listIndex) const
 {
-    if (listIndex == static_cast<unsigned>(m_separatorIndex))
+    int index = convertListIndexToInternalIndex(listIndex);
+    if (index == -1)
         return WebString();
 
-    if (m_separatorIndex != -1 && listIndex > static_cast<unsigned>(m_separatorIndex))
-        --listIndex;
-
-    // FIXME: Modify the PopupMenu to add the label in gray right-justified.
-    ASSERT(listIndex < m_names.size());
-
-    WebString suggestion = m_names[listIndex];
-    if (m_labels[listIndex].isEmpty())
-        return suggestion;
-
-    return suggestion + String(" (") + m_labels[listIndex] + String(")");
+    ASSERT(index < m_names.size());
+    return m_names[index];
+}
+
+WebString AutoFillPopupMenuClient::getLabel(unsigned listIndex) const
+{
+    int index = convertListIndexToInternalIndex(listIndex);
+    if (index == -1)
+        return WebString();
+
+    ASSERT(index < m_labels.size());
+    return m_labels[index];
 }
 
@@ -151 +153 @@
 }
 
+String AutoFillPopupMenuClient::itemLabel(unsigned listIndex) const
+{
+    return getLabel(listIndex);
+}
+
 PopupMenuStyle AutoFillPopupMenuClient::itemStyle(unsigned listIndex) const
 {
@@ -269 +276 @@
     if (getSelectedIndex() >= static_cast<int>(names.size()))
         setSelectedIndex(-1);
+}
+
+int AutoFillPopupMenuClient::convertListIndexToInternalIndex(unsigned listIndex) const
+{
+    if (listIndex == static_cast<unsigned>(m_separatorIndex))
+        return -1;
+
+    if (m_separatorIndex == -1 || listIndex < static_cast<unsigned>(m_separatorIndex))
+        return listIndex;
+    return listIndex - 1;
 }
 

trunk/WebKit/chromium/src/AutoFillPopupMenuClient.h

@@ -58 +58 @@
     virtual WebString getSuggestion(unsigned listIndex) const;
 
+    // Returns the label at |listIndex|.
+    virtual WebString getLabel(unsigned listIndex) const;
+    
     // Removes the suggestion at |listIndex| from the list of suggestions.
     virtual void removeSuggestionAtIndex(unsigned listIndex);
@@ -66 +69 @@
     virtual void selectionCleared();
     virtual WebCore::String itemText(unsigned listIndex) const;
+    virtual WebCore::String itemLabel(unsigned listIndex) const;
     virtual WebCore::String itemToolTip(unsigned lastIndex) const { return WebCore::String(); }
     virtual WebCore::String itemAccessibilityText(unsigned lastIndex) const { return WebCore::String(); }
@@ -105 +109 @@
 
 private:
+    // Convert the specified index from an index into the visible list (which might
+    // include a separator entry) to an index to |m_names| and |m_labels|.
+    // Returns -1 if the given index points to the separator.
+    int convertListIndexToInternalIndex(unsigned) const;
     WebViewImpl* getWebView() const;
     WebCore::HTMLInputElement* getTextField() const { return m_textField.get(); }