Changeset 54180 in webkit


Ignore:
Timestamp:
Feb 1, 2010 5:16:48 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-02-01 Andreas Kling <andreas.kling@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Use the fallback style on Maemo 5

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

  • platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::RenderThemeQt): (WebCore::RenderThemeQt::fallbackStyle): (WebCore::RenderThemeQt::qStyle): (WebCore::RenderThemeQt::setPaletteFromPageClientIfExists):
  • platform/qt/RenderThemeQt.h:
Location:
trunk/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r54179 r54180  
     12010-02-01  Andreas Kling  <andreas.kling@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Use the fallback style on Maemo 5
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=34376
     8
     9        * platform/qt/RenderThemeQt.cpp:
     10        (WebCore::RenderThemeQt::RenderThemeQt):
     11        (WebCore::RenderThemeQt::fallbackStyle):
     12        (WebCore::RenderThemeQt::qStyle):
     13        (WebCore::RenderThemeQt::setPaletteFromPageClientIfExists):
     14        * platform/qt/RenderThemeQt.h:
     15
    1162010-02-01  Kavita Kanetkar  <kkanetkar@chromium.org>
    217
  • trunk/WebCore/platform/qt/RenderThemeQt.cpp

    r53897 r54180  
    130130    : RenderTheme()
    131131    , m_page(page)
    132     , m_fallbackStyle(0)
    133132{
    134133    QPushButton button;
     
    140139    m_buttonFontPixelSize = fontInfo.pixelSize();
    141140#endif
     141
     142    m_fallbackStyle = QStyleFactory::create(QLatin1String("windows"));
    142143}
    143144
     
    148149
    149150// for some widget painting, we need to fallback to Windows style
    150 QStyle* RenderThemeQt::fallbackStyle()
    151 {
    152     if (!m_fallbackStyle)
    153         m_fallbackStyle = QStyleFactory::create(QLatin1String("windows"));
    154 
    155     if (!m_fallbackStyle)
    156         m_fallbackStyle = QApplication::style();
    157 
    158     return m_fallbackStyle;
     151QStyle* RenderThemeQt::fallbackStyle() const
     152{
     153    return (m_fallbackStyle) ? m_fallbackStyle : QApplication::style();
    159154}
    160155
    161156QStyle* RenderThemeQt::qStyle() const
    162157{
     158#ifdef Q_WS_MAEMO_5
     159    return fallbackStyle();
     160#endif
     161
    163162    if (m_page) {
    164163        QWebPageClient* pageClient = m_page->chrome()->client()->platformPageClient();
     
    774773void RenderThemeQt::setPaletteFromPageClientIfExists(QPalette& palette) const
    775774{
     775#ifdef Q_WS_MAEMO_5
     776    static QPalette lightGrayPalette(Qt::lightGray);
     777    palette = lightGrayPalette;
     778    return;
     779#endif
    776780    // If the webview has a custom palette, use it
    777781    if (!m_page)
  • trunk/WebCore/platform/qt/RenderThemeQt.h

    r53803 r54180  
    146146    void setPaletteFromPageClientIfExists(QPalette&) const;
    147147
    148     QStyle* fallbackStyle();
     148    QStyle* fallbackStyle() const;
    149149
    150150    Page* m_page;
Note: See TracChangeset for help on using the changeset viewer.