whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set Android palette and fonts in QPA plugin. 

Task-number: QTBUG-40621
Change-Id: Ibe069d4f93ac317e4f1b9ef5fc6bc3edcfac8685
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
bb10
BogDan Vatra 2014-11-14 17:49:32 +02:00 committed by Jani Heikkinen
parent 4decaa566c
commit acd06b6ef6
6 changed files with 335 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/platforms/android/qandroidplatformintegration.cpp
View File

@ -78,10 +78,24 @@ void *QAndroidPlatformNativeInterface::nativeResourceForIntegration(const QByteA
return QtAndroid::javaVM();
if (resource == "QtActivity")
return QtAndroid::activity();
if (resource == "AndroidStylePalettes")
return &m_palettes;
if (resource == "AndroidStyleFonts")
return &m_fonts;
if (resource == "AndroidStyleData") {
if (m_androidStyle)
return &m_androidStyle->m_styleData;
else
return Q_NULLPTR;
}
if (resource == "AndroidStandardPalette") {
if (m_androidStyle)
return &m_androidStyle->m_standardPalette;
else
return Q_NULLPTR;
}
if (resource == "AndroidQWidgetFonts") {
if (m_androidStyle)
return &m_androidStyle->m_QWidgetsFonts;
else
return Q_NULLPTR;
}
if (resource == "AndroidDeviceName") {
static QString deviceName = QtAndroid::deviceName();
return &deviceName;

6
src/plugins/platforms/android/qandroidplatformintegration.h
View File

@ -44,6 +44,8 @@
#include "qandroidplatformscreen.h"
#include <memory>
QT_BEGIN_NAMESPACE
class QDesktopWidget;
@ -51,12 +53,12 @@ class QAndroidPlatformServices;
class QAndroidSystemLocale;
class QPlatformAccessibility;
struct AndroidStyle;
class QAndroidPlatformNativeInterface: public QPlatformNativeInterface
{
public:
void *nativeResourceForIntegration(const QByteArray &resource);
QHash<int, QPalette> m_palettes;
QHash<int, QFont> m_fonts;
std::shared_ptr<AndroidStyle> m_androidStyle;
};
class QAndroidPlatformIntegration : public QPlatformIntegration

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

@ -37,17 +37,281 @@
#include "qandroidplatformmenu.h"
#include "qandroidplatformmenuitem.h"
#include "qandroidplatformdialoghelpers.h"
#include <QVariant>
#include <QFileInfo>
#include <QCoreApplication>
#include <QDebug>
#include <QFileInfo>
#include <QJsonDocument>
#include <QVariant>
#include <private/qguiapplication_p.h>
#include <qandroidplatformintegration.h>
QT_BEGIN_NAMESPACE
namespace {
const int textStyle_bold = 1;
const int textStyle_italic = 2;
const int typeface_sans = 1;
const int typeface_serif = 2;
const int typeface_monospace = 3;
}
static int fontType(const QString &androidControl)
{
if (androidControl == QLatin1String("defaultStyle"))
return QPlatformTheme::SystemFont;
if (androidControl == QLatin1String("textViewStyle"))
return QPlatformTheme::LabelFont;
else if (androidControl == QLatin1String("buttonStyle"))
return QPlatformTheme::PushButtonFont;
else if (androidControl == QLatin1String("checkboxStyle"))
return QPlatformTheme::CheckBoxFont;
else if (androidControl == QLatin1String("radioButtonStyle"))
return QPlatformTheme::RadioButtonFont;
else if (androidControl == QLatin1String("simple_list_item_single_choice"))
return QPlatformTheme::ItemViewFont;
else if (androidControl == QLatin1String("simple_spinner_dropdown_item"))
return QPlatformTheme::ComboMenuItemFont;
else if (androidControl == QLatin1String("spinnerStyle"))
return QPlatformTheme::ComboLineEditFont;
else if (androidControl == QLatin1String("simple_list_item"))
return QPlatformTheme::ListViewFont;
return -1;
}
static int paletteType(const QString &androidControl)
{
if (androidControl == QLatin1String("defaultStyle"))
return QPlatformTheme::SystemPalette;
if (androidControl == QLatin1String("textViewStyle"))
return QPlatformTheme::LabelPalette;
else if (androidControl == QLatin1String("buttonStyle"))
return QPlatformTheme::ButtonPalette;
else if (androidControl == QLatin1String("checkboxStyle"))
return QPlatformTheme::CheckBoxPalette;
else if (androidControl == QLatin1String("radioButtonStyle"))
return QPlatformTheme::RadioButtonPalette;
else if (androidControl == QLatin1String("simple_list_item_single_choice"))
return QPlatformTheme::ItemViewPalette;
else if (androidControl == QLatin1String("editTextStyle"))
return QPlatformTheme::TextLineEditPalette;
else if (androidControl == QLatin1String("spinnerStyle"))
return QPlatformTheme::ComboBoxPalette;
return -1;
}
static void setPaletteColor(const QVariantMap &object,
QPalette &palette,
QPalette::ColorRole role)
{
// QPalette::Active -> ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET
palette.setColor(QPalette::Active,
role,
QRgb(object.value(QLatin1String("ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET")).toInt()));
// QPalette::Inactive -> ENABLED_STATE_SET
palette.setColor(QPalette::Inactive,
role,
QRgb(object.value(QLatin1String("ENABLED_STATE_SET")).toInt()));
// QPalette::Disabled -> EMPTY_STATE_SET
palette.setColor(QPalette::Disabled,
role,
QRgb(object.value(QLatin1String("EMPTY_STATE_SET")).toInt()));
palette.setColor(QPalette::Current, role, palette.color(QPalette::Active, role));
if (role == QPalette::WindowText) {
// QPalette::BrightText -> PRESSED
// QPalette::Active -> PRESSED_ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET
palette.setColor(QPalette::Active,
QPalette::BrightText,
QRgb(object.value(QLatin1String("PRESSED_ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET")).toInt()));
// QPalette::Inactive -> PRESSED_ENABLED_STATE_SET
palette.setColor(QPalette::Inactive,
QPalette::BrightText,
QRgb(object.value(QLatin1String("PRESSED_ENABLED_STATE_SET")).toInt()));
// QPalette::Disabled -> PRESSED_STATE_SET
palette.setColor(QPalette::Disabled,
QPalette::BrightText,
QRgb(object.value(QLatin1String("PRESSED_STATE_SET")).toInt()));
palette.setColor(QPalette::Current, QPalette::BrightText, palette.color(QPalette::Active, QPalette::BrightText));
// QPalette::HighlightedText -> SELECTED
// QPalette::Active -> ENABLED_SELECTED_WINDOW_FOCUSED_STATE_SET
palette.setColor(QPalette::Active,
QPalette::HighlightedText,
QRgb(object.value(QLatin1String("ENABLED_SELECTED_WINDOW_FOCUSED_STATE_SET")).toInt()));
// QPalette::Inactive -> ENABLED_SELECTED_STATE_SET
palette.setColor(QPalette::Inactive,
QPalette::HighlightedText,
QRgb(object.value(QLatin1String("ENABLED_SELECTED_STATE_SET")).toInt()));
// QPalette::Disabled -> SELECTED_STATE_SET
palette.setColor(QPalette::Disabled,
QPalette::HighlightedText,
QRgb(object.value(QLatin1String("SELECTED_STATE_SET")).toInt()));
palette.setColor(QPalette::Current,
QPalette::HighlightedText,
palette.color(QPalette::Active, QPalette::HighlightedText));
// Same colors for Text
palette.setColor(QPalette::Active, QPalette::Text, palette.color(QPalette::Active, role));
palette.setColor(QPalette::Inactive, QPalette::Text, palette.color(QPalette::Inactive, role));
palette.setColor(QPalette::Disabled, QPalette::Text, palette.color(QPalette::Disabled, role));
palette.setColor(QPalette::Current, QPalette::Text, palette.color(QPalette::Current, role));
// And for ButtonText
palette.setColor(QPalette::Active, QPalette::ButtonText, palette.color(QPalette::Active, role));
palette.setColor(QPalette::Inactive, QPalette::ButtonText, palette.color(QPalette::Inactive, role));
palette.setColor(QPalette::Disabled, QPalette::ButtonText, palette.color(QPalette::Disabled, role));
palette.setColor(QPalette::Current, QPalette::ButtonText, palette.color(QPalette::Current, role));
}
}
static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette)
{
QString stylePath(QLatin1String(qgetenv("MINISTRO_ANDROID_STYLE_PATH")));
const QLatin1Char slashChar('/');
if (!stylePath.isEmpty() && !stylePath.endsWith(slashChar))
stylePath += slashChar;
QString androidTheme = QLatin1String(qgetenv("QT_ANDROID_THEME"));
if (!androidTheme.isEmpty() && !androidTheme.endsWith(slashChar))
androidTheme += slashChar;
if (stylePath.isEmpty()) {
stylePath = QLatin1String("/data/data/org.kde.necessitas.ministro/files/dl/style/")
+ QLatin1String(qgetenv("QT_ANDROID_THEME_DISPLAY_DPI")) + slashChar;
}
Q_ASSERT(!stylePath.isEmpty());
if (!androidTheme.isEmpty() && QFileInfo(stylePath + androidTheme + QLatin1String("style.json")).exists())
stylePath += androidTheme;
QFile f(stylePath + QLatin1String("style.json"));
if (!f.open(QIODevice::ReadOnly))
return std::shared_ptr<AndroidStyle>();
QJsonParseError error;
QJsonDocument document = QJsonDocument::fromJson(f.readAll(), &error);
if (document.isNull()) {
qCritical() << error.errorString();
return std::shared_ptr<AndroidStyle>();
}
if (!document.isObject()) {
qCritical() << "Style.json does not contain a valid style.";
return std::shared_ptr<AndroidStyle>();
}
std::shared_ptr<AndroidStyle> style(new AndroidStyle);
style->m_styleData = document.object();
for (QJsonObject::const_iterator objectIterator = style->m_styleData.constBegin();
objectIterator != style->m_styleData.constEnd();
++objectIterator) {
QString key = objectIterator.key();
QJsonValue value = objectIterator.value();
if (!value.isObject()) {
qWarning("Style.json structure is unrecognized.");
continue;
}
QJsonObject item = value.toObject();
QJsonObject::const_iterator attributeIterator = item.find(QLatin1String("qtClass"));
QByteArray qtClassName;
if (attributeIterator != item.constEnd()) {
// The item has palette and font information for a specific Qt Class (e.g. QWidget, QPushButton, etc.)
qtClassName = attributeIterator.value().toString().toLatin1();
}
const int ft = fontType(key);
if (ft > -1 || !qtClassName.isEmpty()) {
// Extract font information
QFont font;
// Font size (in pixels)
attributeIterator = item.find(QLatin1String("TextAppearance_textSize"));
if (attributeIterator != item.constEnd())
font.setPixelSize(int(attributeIterator.value().toDouble()));
// Font style
attributeIterator = item.find(QLatin1String("TextAppearance_textStyle"));
if (attributeIterator != item.constEnd()) {
const int style = int(attributeIterator.value().toDouble());
font.setBold(style & textStyle_bold);
font.setItalic(style & textStyle_italic);
}
// Font typeface
attributeIterator = item.find(QLatin1String("TextAppearance_typeface"));
if (attributeIterator != item.constEnd()) {
QFont::StyleHint styleHint = QFont::AnyStyle;
switch (int(attributeIterator.value().toDouble())) {
case typeface_sans:
styleHint = QFont::SansSerif;
break;
case typeface_serif:
styleHint = QFont::Serif;
break;
case typeface_monospace:
styleHint = QFont::Monospace;
break;
}
font.setStyleHint(styleHint, QFont::PreferMatch);
}
if (!qtClassName.isEmpty())
style->m_QWidgetsFonts.insert(qtClassName, font);
if (ft > -1) {
style->m_fonts.insert(ft, font);
if (ft == QPlatformTheme::SystemFont)
QGuiApplication::setFont(font);
}
// Extract font information
}
const int pt = paletteType(key);
if (pt > -1 || !qtClassName.isEmpty()) {
// Extract palette information
QPalette palette;
attributeIterator = item.find(QLatin1String("defaultTextColorPrimary"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::WindowText, QRgb(int(attributeIterator.value().toDouble())));
attributeIterator = item.find(QLatin1String("defaultBackgroundColor"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::Background, QRgb(int(attributeIterator.value().toDouble())));
attributeIterator = item.find(QLatin1String("TextAppearance_textColor"));
if (attributeIterator != item.constEnd())
setPaletteColor(attributeIterator.value().toObject().toVariantMap(), palette, QPalette::WindowText);
attributeIterator = item.find(QLatin1String("TextAppearance_textColorLink"));
if (attributeIterator != item.constEnd())
setPaletteColor(attributeIterator.value().toObject().toVariantMap(), palette, QPalette::Link);
attributeIterator = item.find(QLatin1String("TextAppearance_textColorHighlight"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::Highlight, QRgb(int(attributeIterator.value().toDouble())));
if (pt == QPlatformTheme::SystemPalette)
*defaultPalette = style->m_standardPalette = palette;
if (pt > -1)
style->m_palettes.insert(pt, palette);
// Extract palette information
}
}
return style;
}
QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *androidPlatformNativeInterface)
{
m_androidPlatformNativeInterface = androidPlatformNativeInterface;
QColor background(229, 229, 229);
QColor light = background.lighter(150);
QColor mid(background.darker(130));
@ -80,6 +344,9 @@ QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *an
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));
m_androidStyleData = loadAndroidStyle(&m_defaultPalette);
QGuiApplication::setPalette(m_defaultPalette);
androidPlatformNativeInterface->m_androidStyle = m_androidStyleData;
}
QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const
@ -132,9 +399,11 @@ static inline int paletteType(QPlatformTheme::Palette type)
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());
if (m_androidStyleData) {
auto it = m_androidStyleData->m_palettes.find(paletteType(type));
if (it != m_androidStyleData->m_palettes.end())
return &(it.value());
}
return &m_defaultPalette;
}
@ -154,9 +423,11 @@ static inline int fontType(QPlatformTheme::Font type)
const QFont *QAndroidPlatformTheme::font(Font type) const
{
QHash<int, QFont>::const_iterator it = m_androidPlatformNativeInterface->m_fonts.find(fontType(type));
if (it != m_androidPlatformNativeInterface->m_fonts.end())
return &(it.value());
if (m_androidStyleData) {
auto it = m_androidStyleData->m_fonts.find(fontType(type));
if (it != m_androidStyleData->m_fonts.end())
return &(it.value());
}
// default in case the style has not set a font
static QFont systemFont("Roboto", 14.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi
@ -165,18 +436,12 @@ const QFont *QAndroidPlatformTheme::font(Font type) const
return 0;
}
static const QLatin1String STYLES_PATH("/data/data/org.kde.necessitas.ministro/files/dl/style/");
static const QLatin1String STYLE_FILE("/style.json");
QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
{
switch (hint) {
case StyleNames:
if (qgetenv("QT_USE_ANDROID_NATIVE_STYLE").toInt()
&& (!qgetenv("MINISTRO_ANDROID_STYLE_PATH").isEmpty()
|| QFileInfo(STYLES_PATH
+ QLatin1String(qgetenv("QT_ANDROID_THEME_DISPLAY_DPI"))
+ STYLE_FILE).exists())) {
&& m_androidStyleData) {
return QStringList("android");
}
return QStringList("fusion");

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

@ -37,8 +37,22 @@
#include <qpa/qplatformtheme.h>
#include <QtGui/qpalette.h>
#include <QJsonObject>
#include <memory>
QT_BEGIN_NAMESPACE
struct AndroidStyle
{
QJsonObject m_styleData;
QPalette m_standardPalette;
QHash<int, QPalette> m_palettes;
QHash<int, QFont> m_fonts;
QHash<QByteArray, QFont> m_QWidgetsFonts;
QHash<QByteArray, QFont> m_QWidgetsPalettes;
};
class QAndroidPlatformNativeInterface;
class QAndroidPlatformTheme: public QPlatformTheme
{
@ -57,7 +71,7 @@ public:
private:
QAndroidPlatformNativeInterface * m_androidPlatformNativeInterface;
std::shared_ptr<AndroidStyle> m_androidStyleData;
QPalette m_defaultPalette;
};

260
src/widgets/styles/qandroidstyle.cpp
View File

@ -38,7 +38,6 @@
#include <QFile>
#include <QFont>
#include <QApplication>
#include <QTime>
#include <qdrawutil.h>
#include <QPixmapCache>
#include <QFileInfo>
@ -55,105 +54,33 @@
QT_BEGIN_NAMESPACE
namespace {
const int textStyle_bold = 1;
const int textStyle_italic = 2;
const int typeface_sans = 1;
const int typeface_serif = 2;
const int typeface_monospace = 3;
const quint32 NO_COLOR = 1;
const quint32 TRANSPARENT_COLOR = 0;
}
static int fontType(const QString &androidControl)
{
if (androidControl == QLatin1String("textViewStyle"))
return QPlatformTheme::SystemFont;
else if (androidControl == QLatin1String("buttonStyle"))
return QPlatformTheme::PushButtonFont;
else if (androidControl == QLatin1String("checkboxStyle"))
return QPlatformTheme::CheckBoxFont;
else if (androidControl == QLatin1String("radioButtonStyle"))
return QPlatformTheme::RadioButtonFont;
else if (androidControl == QLatin1String("simple_list_item_single_choice"))
return QPlatformTheme::ItemViewFont;
else if (androidControl == QLatin1String("simple_spinner_dropdown_item"))
return QPlatformTheme::ComboMenuItemFont;
else if (androidControl == QLatin1String("spinnerStyle"))
return QPlatformTheme::ComboLineEditFont;
else if (androidControl == QLatin1String("simple_list_item"))
return QPlatformTheme::ListViewFont;
return -1;
}
static int paletteType(const QString &androidControl)
{
if (androidControl == QLatin1String("textViewStyle"))
return QPlatformTheme::SystemPalette;
else if (androidControl == QLatin1String("buttonStyle"))
return QPlatformTheme::ButtonPalette;
else if (androidControl == QLatin1String("checkboxStyle"))
return QPlatformTheme::CheckBoxPalette;
else if (androidControl == QLatin1String("radioButtonStyle"))
return QPlatformTheme::RadioButtonPalette;
else if (androidControl == QLatin1String("simple_list_item_single_choice"))
return QPlatformTheme::ItemViewPalette;
else if (androidControl == QLatin1String("editTextStyle"))
return QPlatformTheme::TextLineEditPalette;
else if (androidControl == QLatin1String("spinnerStyle"))
return QPlatformTheme::ComboBoxPalette;
return -1;
}
QAndroidStyle::QAndroidStyle()
: QFusionStyle()
{
QPixmapCache::clear();
checkBoxControl = NULL;
QString stylePath(QLatin1String(qgetenv("MINISTRO_ANDROID_STYLE_PATH")));
const QLatin1Char slashChar('/');
if (!stylePath.isEmpty() && !stylePath.endsWith(slashChar))
stylePath += slashChar;
QString androidTheme = QLatin1String(qgetenv("QT_ANDROID_THEME"));
if (!androidTheme.isEmpty() && !androidTheme.endsWith(slashChar))
androidTheme += slashChar;
if (stylePath.isEmpty()) {
stylePath = QLatin1String("/data/data/org.kde.necessitas.ministro/files/dl/style/")
+ QLatin1String(qgetenv("QT_ANDROID_THEME_DISPLAY_DPI")) + slashChar;
}
Q_ASSERT(!stylePath.isEmpty());
if (!androidTheme.isEmpty() && QFileInfo(stylePath + androidTheme + QLatin1String("style.json")).exists())
stylePath += androidTheme;
QFile f(stylePath + QLatin1String("style.json"));
if (!f.open(QIODevice::ReadOnly))
return;
QJsonParseError error;
QJsonDocument document = QJsonDocument::fromJson(f.readAll(), &error);
if (document.isNull()) {
qCritical() << error.errorString();
return;
}
if (!document.isObject()) {
qCritical() << "Style.json does not contain a valid style.";
return;
}
QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
QPalette *standardPalette = reinterpret_cast<QPalette *>(nativeInterface->nativeResourceForIntegration("AndroidStandardPalette"));
if (standardPalette)
m_standardPalette = *standardPalette;
QHash<int, QPalette> *palettes = reinterpret_cast<QHash<int, QPalette> *>(nativeInterface->nativeResourceForIntegration("AndroidStylePalettes"));
QHash<int, QFont> *fonts = reinterpret_cast<QHash<int, QFont> *>(nativeInterface->nativeResourceForIntegration("AndroidStyleFonts"));
palettes->clear();
fonts->clear();
QJsonObject object = document.object();
for (QJsonObject::const_iterator objectIterator = object.constBegin();
objectIterator != object.constEnd();
QHash<QByteArray, QFont> *qwidgetsFonts = reinterpret_cast<QHash<QByteArray, QFont> *>(nativeInterface->nativeResourceForIntegration("AndroidQWidgetFonts"));
if (qwidgetsFonts) {
for (auto it = qwidgetsFonts->constBegin(); it != qwidgetsFonts->constEnd(); ++it)
QApplication::setFont(it.value(), it.key());
qwidgetsFonts->clear(); // free the memory
}
QJsonObject *object = reinterpret_cast<QJsonObject *>(nativeInterface->nativeResourceForIntegration("AndroidStyleData"));
if (!object)
return;
for (QJsonObject::const_iterator objectIterator = object->constBegin();
objectIterator != object->constEnd();
++objectIterator) {
QString key = objectIterator.key();
QJsonValue value = objectIterator.value();
@ -163,85 +90,6 @@ QAndroidStyle::QAndroidStyle()
}
QJsonObject item = value.toObject();
QJsonObject::const_iterator attributeIterator = item.find(QLatin1String("qtClass"));
QString qtClassName;
if (attributeIterator != item.constEnd()) {
// The item has palette and font information for a specific Qt Class (e.g. QWidget, QPushButton, etc.)
qtClassName = attributeIterator.value().toString();
}
const int ft = fontType(key);
if (ft > -1 || !qtClassName.isEmpty()) {
// Extract font information
QFont font;
// Font size (in pixels)
attributeIterator = item.find(QLatin1String("TextAppearance_textSize"));
if (attributeIterator != item.constEnd())
font.setPixelSize(int(attributeIterator.value().toDouble()));
// Font style
attributeIterator = item.find(QLatin1String("TextAppearance_textStyle"));
if (attributeIterator != item.constEnd()) {
const int style = int(attributeIterator.value().toDouble());
font.setBold(style & textStyle_bold);
font.setItalic(style & textStyle_italic);
}
// Font typeface
attributeIterator = item.find(QLatin1String("TextAppearance_typeface"));
if (attributeIterator != item.constEnd()) {
QFont::StyleHint styleHint = QFont::AnyStyle;
switch (int(attributeIterator.value().toDouble())) {
case typeface_sans:
styleHint = QFont::SansSerif;
break;
case typeface_serif:
styleHint = QFont::Serif;
break;
case typeface_monospace:
styleHint = QFont::Monospace;
break;
}
font.setStyleHint(styleHint, QFont::PreferMatch);
}
if (!qtClassName.isEmpty())
QApplication::setFont(font, qtClassName.toUtf8());
if (ft > -1)
fonts->insert(ft, font);
// Extract font information
}
const int pt = paletteType(key);
if (pt > -1 || !qtClassName.isEmpty()) {
// Extract palette information
QPalette palette;
attributeIterator = item.find(QLatin1String("defaultTextColorPrimary"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::WindowText, QRgb(int(attributeIterator.value().toDouble())));
attributeIterator = item.find(QLatin1String("defaultBackgroundColor"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::Background, QRgb(int(attributeIterator.value().toDouble())));
attributeIterator = item.find(QLatin1String("TextAppearance_textColor"));
if (attributeIterator != item.constEnd())
setPaletteColor(attributeIterator.value().toObject().toVariantMap(), palette, QPalette::WindowText);
attributeIterator = item.find(QLatin1String("TextAppearance_textColorLink"));
if (attributeIterator != item.constEnd())
setPaletteColor(attributeIterator.value().toObject().toVariantMap(), palette, QPalette::Link);
attributeIterator = item.find(QLatin1String("TextAppearance_textColorHighlight"));
if (attributeIterator != item.constEnd())
palette.setColor(QPalette::Highlight, QRgb(int(attributeIterator.value().toDouble())));
if (QLatin1String("QWidget") == qtClassName)
m_standardPalette = palette;
if (pt > -1)
palettes->insert(pt, palette);
// Extract palette information
}
QAndroidStyle::ItemType itemType = qtControl(key);
if (QC_UnknownType == itemType)
continue;
@ -277,6 +125,7 @@ QAndroidStyle::QAndroidStyle()
break;
}
}
*object = QJsonObject(); // free memory
}
QAndroidStyle::~QAndroidStyle()
@ -284,81 +133,6 @@ QAndroidStyle::~QAndroidStyle()
qDeleteAll(m_androidControlsHash);
}
void QAndroidStyle::setPaletteColor(const QVariantMap &object,
QPalette &palette,
QPalette::ColorRole role)
{
// QPalette::Active -> ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET
palette.setColor(QPalette::Active,
role,
QRgb(object.value(QLatin1String("ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET")).toInt()));
// QPalette::Inactive -> ENABLED_STATE_SET
palette.setColor(QPalette::Inactive,
role,
QRgb(object.value(QLatin1String("ENABLED_STATE_SET")).toInt()));
// QPalette::Disabled -> EMPTY_STATE_SET
palette.setColor(QPalette::Disabled,
role,
QRgb(object.value(QLatin1String("EMPTY_STATE_SET")).toInt()));
palette.setColor(QPalette::Current, role, palette.color(QPalette::Active, role));
if (role == QPalette::WindowText) {
// QPalette::BrightText -> PRESSED
// QPalette::Active -> PRESSED_ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET
palette.setColor(QPalette::Active,
QPalette::BrightText,
QRgb(object.value(QLatin1String("PRESSED_ENABLED_FOCUSED_WINDOW_FOCUSED_STATE_SET")).toInt()));
// QPalette::Inactive -> PRESSED_ENABLED_STATE_SET
palette.setColor(QPalette::Inactive,
QPalette::BrightText,
QRgb(object.value(QLatin1String("PRESSED_ENABLED_STATE_SET")).toInt()));
// QPalette::Disabled -> PRESSED_STATE_SET
palette.setColor(QPalette::Disabled,
QPalette::BrightText,
QRgb(object.value(QLatin1String("PRESSED_STATE_SET")).toInt()));
palette.setColor(QPalette::Current, QPalette::BrightText, palette.color(QPalette::Active, QPalette::BrightText));
// QPalette::HighlightedText -> SELECTED
// QPalette::Active -> ENABLED_SELECTED_WINDOW_FOCUSED_STATE_SET
palette.setColor(QPalette::Active,
QPalette::HighlightedText,
QRgb(object.value(QLatin1String("ENABLED_SELECTED_WINDOW_FOCUSED_STATE_SET")).toInt()));
// QPalette::Inactive -> ENABLED_SELECTED_STATE_SET
palette.setColor(QPalette::Inactive,
QPalette::HighlightedText,
QRgb(object.value(QLatin1String("ENABLED_SELECTED_STATE_SET")).toInt()));
// QPalette::Disabled -> SELECTED_STATE_SET
palette.setColor(QPalette::Disabled,
QPalette::HighlightedText,
QRgb(object.value(QLatin1String("SELECTED_STATE_SET")).toInt()));
palette.setColor(QPalette::Current,
QPalette::HighlightedText,
palette.color(QPalette::Active, QPalette::HighlightedText));
// Same colors for Text
palette.setColor(QPalette::Active, QPalette::Text, palette.color(QPalette::Active, role));
palette.setColor(QPalette::Inactive, QPalette::Text, palette.color(QPalette::Inactive, role));
palette.setColor(QPalette::Disabled, QPalette::Text, palette.color(QPalette::Disabled, role));
palette.setColor(QPalette::Current, QPalette::Text, palette.color(QPalette::Current, role));
// And for ButtonText
palette.setColor(QPalette::Active, QPalette::ButtonText, palette.color(QPalette::Active, role));
palette.setColor(QPalette::Inactive, QPalette::ButtonText, palette.color(QPalette::Inactive, role));
palette.setColor(QPalette::Disabled, QPalette::ButtonText, palette.color(QPalette::Disabled, role));
palette.setColor(QPalette::Current, QPalette::ButtonText, palette.color(QPalette::Current, role));
}
}
QAndroidStyle::ItemType QAndroidStyle::qtControl(const QString &android)
{
if (android == QLatin1String("buttonStyle"))

3
src/widgets/styles/qandroidstyle_p.h
View File

@ -376,9 +376,6 @@ private:
static ItemType qtControl(QStyle::SubElement subElement);
static ItemType qtControl(const QString &android);
static void setPaletteColor(const QVariantMap &object,
QPalette &palette,
QPalette::ColorRole role);
private:
typedef QHash<int, AndroidControl *> AndroidControlsHash;
AndroidControlsHash m_androidControlsHash;