AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: default palette taken from the Holo Light theme

Browse Source 
Currently QAndroidPlatformTheme::palette has been returning null so
the default colors came from elsewhere.  Now they will default to
colors taken from the Holo Light theme to the extent possible.

Change-Id: I022c5ef679d9d0dcb76721a4d520492bc8a6f4cf
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Shawn Rutledge 2014-01-17 15:00:07 +01:00 committed by The Qt Project
parent ab1ec81f58
commit 2e965ca8b7
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/platforms/android/qandroidplatformtheme.cpp
View File

@ -52,6 +52,38 @@
QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *androidPlatformNativeInterface)
{
m_androidPlatformNativeInterface = androidPlatformNativeInterface;
QColor background(229, 229, 229);
QColor light = background.lighter(150);
QColor mid(background.darker(130));
QColor midLight = mid.lighter(110);
QColor base(249, 249, 249);
QColor disabledBase(background);
QColor dark = background.darker(150);
QColor darkDisabled = dark.darker(110);
QColor text = Qt::black;
QColor highlightedText = Qt::black;
QColor disabledText = QColor(190, 190, 190);
QColor button(241, 241, 241);
QColor shadow(201, 201, 201);
QColor highlight(148, 210, 231);
QColor disabledShadow = shadow.lighter(150);
m_defaultPalette = QPalette(Qt::black,background,light,dark,mid,text,base);
m_defaultPalette.setBrush(QPalette::Midlight, midLight);
m_defaultPalette.setBrush(QPalette::Button, button);
m_defaultPalette.setBrush(QPalette::Shadow, shadow);
m_defaultPalette.setBrush(QPalette::HighlightedText, highlightedText);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Text, disabledText);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::WindowText, disabledText);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::ButtonText, disabledText);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Base, disabledBase);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Dark, darkDisabled);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Shadow, disabledShadow);
m_defaultPalette.setBrush(QPalette::Active, QPalette::Highlight, highlight);
m_defaultPalette.setBrush(QPalette::Inactive, QPalette::Highlight, highlight);
m_defaultPalette.setBrush(QPalette::Disabled, QPalette::Highlight, highlight.lighter(150));
}
QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const
@ -102,7 +134,7 @@ const QPalette *QAndroidPlatformTheme::palette(Palette type) const
QHash<int, QPalette>::const_iterator it = m_androidPlatformNativeInterface->m_palettes.find(paletteType(type));
if (it != m_androidPlatformNativeInterface->m_palettes.end())
return &(it.value());
return 0;
return &m_defaultPalette;
}
static inline int fontType(QPlatformTheme::Font type)

3
src/plugins/platforms/android/qandroidplatformtheme.h
View File

@ -43,6 +43,8 @@
#define QANDROIDPLATFORMTHEME_H
#include <qpa/qplatformtheme.h>
#include <QPalette>
class QAndroidPlatformNativeInterface;
class QAndroidPlatformTheme: public QPlatformTheme
{
@ -61,6 +63,7 @@ public:
private:
QAndroidPlatformNativeInterface * m_androidPlatformNativeInterface;
QPalette m_defaultPalette;
};
#endif // QANDROIDPLATFORMTHEME_H