Changeset 54180 in webkit
- Timestamp:
- Feb 1, 2010 5:16:48 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r54179 r54180 1 2010-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 1 16 2010-02-01 Kavita Kanetkar <kkanetkar@chromium.org> 2 17 -
trunk/WebCore/platform/qt/RenderThemeQt.cpp
r53897 r54180 130 130 : RenderTheme() 131 131 , m_page(page) 132 , m_fallbackStyle(0)133 132 { 134 133 QPushButton button; … … 140 139 m_buttonFontPixelSize = fontInfo.pixelSize(); 141 140 #endif 141 142 m_fallbackStyle = QStyleFactory::create(QLatin1String("windows")); 142 143 } 143 144 … … 148 149 149 150 // 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; 151 QStyle* RenderThemeQt::fallbackStyle() const 152 { 153 return (m_fallbackStyle) ? m_fallbackStyle : QApplication::style(); 159 154 } 160 155 161 156 QStyle* RenderThemeQt::qStyle() const 162 157 { 158 #ifdef Q_WS_MAEMO_5 159 return fallbackStyle(); 160 #endif 161 163 162 if (m_page) { 164 163 QWebPageClient* pageClient = m_page->chrome()->client()->platformPageClient(); … … 774 773 void RenderThemeQt::setPaletteFromPageClientIfExists(QPalette& palette) const 775 774 { 775 #ifdef Q_WS_MAEMO_5 776 static QPalette lightGrayPalette(Qt::lightGray); 777 palette = lightGrayPalette; 778 return; 779 #endif 776 780 // If the webview has a custom palette, use it 777 781 if (!m_page) -
trunk/WebCore/platform/qt/RenderThemeQt.h
r53803 r54180 146 146 void setPaletteFromPageClientIfExists(QPalette&) const; 147 147 148 QStyle* fallbackStyle() ;148 QStyle* fallbackStyle() const; 149 149 150 150 Page* m_page;
Note: See TracChangeset
for help on using the changeset viewer.