diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp')
-rw-r--r-- | Source/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp index 9c23133..b80dccd 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/win/WebPopupMenuWin.cpp @@ -23,6 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include "WebPopupMenu.h" #include "PlatformPopupMenuData.h" @@ -49,7 +50,7 @@ void WebPopupMenu::setUpPlatformData(const WebCore::IntRect& pageCoordinates, Pl data.m_clientPaddingRight = m_popupClient->clientPaddingRight(); data.m_clientInsetLeft = m_popupClient->clientInsetLeft(); data.m_clientInsetRight = m_popupClient->clientInsetRight(); - data.m_itemHeight = m_popupClient->menuStyle().font().height() + 1; + data.m_itemHeight = m_popupClient->menuStyle().font().fontMetrics().height() + 1; int popupWidth = 0; for (size_t i = 0; i < itemCount; ++i) { @@ -115,7 +116,7 @@ void WebPopupMenu::setUpPlatformData(const WebCore::IntRect& pageCoordinates, Pl unsigned length = itemText.length(); const UChar* string = itemText.characters(); - TextRun textRun(string, length, false, 0, 0, itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft); + TextRun textRun(string, length, false, 0, 0, TextRun::AllowTrailingExpansion, itemText.defaultWritingDirection() == WTF::Unicode::RightToLeft); notSelectedBackingStoreContext->setFillColor(optionTextColor, ColorSpaceDeviceRGB); selectedBackingStoreContext->setFillColor(activeOptionTextColor, ColorSpaceDeviceRGB); @@ -133,7 +134,7 @@ void WebPopupMenu::setUpPlatformData(const WebCore::IntRect& pageCoordinates, Pl int textX = std::max(0, data.m_clientPaddingLeft - data.m_clientInsetLeft); if (RenderTheme::defaultTheme()->popupOptionSupportsTextIndent() && itemStyle.textDirection() == LTR) textX += itemStyle.textIndent().calcMinValue(itemRect.width()); - int textY = itemRect.y() + itemFont.ascent() + (itemRect.height() - itemFont.height()) / 2; + int textY = itemRect.y() + itemFont.fontMetrics().ascent() + (itemRect.height() - itemFont.fontMetrics().height()) / 2; notSelectedBackingStoreContext->drawBidiText(itemFont, textRun, IntPoint(textX, textY)); selectedBackingStoreContext->drawBidiText(itemFont, textRun, IntPoint(textX, textY)); |