diff --git a/adwaita-qt-correct-colors-for-light-midlight-dark-mid.patch b/adwaita-qt-correct-colors-for-light-midlight-dark-mid.patch new file mode 100644 index 0000000..6d49731 --- /dev/null +++ b/adwaita-qt-correct-colors-for-light-midlight-dark-mid.patch @@ -0,0 +1,94 @@ +diff --git a/style/adwaitastyle.cpp b/style/adwaitastyle.cpp +index bf2b67e..da7a34f 100644 +--- a/style/adwaitastyle.cpp ++++ b/style/adwaitastyle.cpp +@@ -538,10 +538,10 @@ void Style::polish(QPalette &palette) + palette.setColor(QPalette::All, QPalette::ButtonText, fg_color); + palette.setColor(QPalette::All, QPalette::BrightText, text_color); + +- palette.setColor(QPalette::All, QPalette::Light, QColor("white")); +- palette.setColor(QPalette::All, QPalette::Midlight, QColor("#d7d7d7")); +- palette.setColor(QPalette::All, QPalette::Mid, QColor("#b4b4b4")); +- palette.setColor(QPalette::All, QPalette::Dark, QColor("#1a1a1a")); ++ palette.setColor(QPalette::All, QPalette::Light, _helper->lighten(button_base_color)); ++ palette.setColor(QPalette::All, QPalette::Midlight, _helper->mix(_helper->lighten(button_base_color), button_base_color)); ++ palette.setColor(QPalette::All, QPalette::Mid, _helper->mix(_helper->darken(button_base_color), button_base_color)); ++ palette.setColor(QPalette::All, QPalette::Dark, _helper->darken(button_base_color)); + palette.setColor(QPalette::All, QPalette::Shadow, shadow); + + palette.setColor(QPalette::All, QPalette::Highlight, selected_bg_color); +@@ -563,10 +563,10 @@ void Style::polish(QPalette &palette) + palette.setColor(QPalette::Disabled, QPalette::ButtonText, insensitive_fg_color); + palette.setColor(QPalette::Disabled, QPalette::BrightText, text_color); + +- palette.setColor(QPalette::Disabled, QPalette::Light, QColor("#f4f4f4")); +- palette.setColor(QPalette::Disabled, QPalette::Midlight, QColor("#f4f4f4")); +- palette.setColor(QPalette::Disabled, QPalette::Dark, QColor("#f4f4f4")); +- palette.setColor(QPalette::Disabled, QPalette::Mid, QColor("#c3c3c3")); ++ palette.setColor(QPalette::Disabled, QPalette::Light, _helper->lighten(insensitive_bg_color)); ++ palette.setColor(QPalette::Disabled, QPalette::Midlight, _helper->mix(_helper->lighten(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Disabled, QPalette::Mid, _helper->mix(_helper->darken(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Disabled, QPalette::Dark, _helper->darken(insensitive_bg_color)); + palette.setColor(QPalette::Disabled, QPalette::Shadow, shadow); + + palette.setColor(QPalette::Disabled, QPalette::Highlight, selected_bg_color); +@@ -585,10 +585,10 @@ void Style::polish(QPalette &palette) + palette.setColor(QPalette::Inactive, QPalette::ButtonText, backdrop_fg_color); + palette.setColor(QPalette::Inactive, QPalette::BrightText, text_color); + +- palette.setColor(QPalette::Inactive, QPalette::Light, QColor("white")); +- palette.setColor(QPalette::Inactive, QPalette::Midlight, QColor("#d7d7d7")); +- palette.setColor(QPalette::Inactive, QPalette::Mid, QColor("#b4b4b4")); +- palette.setColor(QPalette::Inactive, QPalette::Dark, QColor("#33393b")); ++ palette.setColor(QPalette::Inactive, QPalette::Light, _helper->lighten(insensitive_bg_color)); ++ palette.setColor(QPalette::Inactive, QPalette::Midlight, _helper->mix(_helper->lighten(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Inactive, QPalette::Mid, _helper->mix(_helper->darken(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Inactive, QPalette::Dark, _helper->darken(insensitive_bg_color)); + palette.setColor(QPalette::Inactive, QPalette::Shadow, shadow); + + palette.setColor(QPalette::Inactive, QPalette::Highlight, selected_bg_color); +@@ -630,10 +630,10 @@ void Style::polish(QPalette &palette) + palette.setColor(QPalette::All, QPalette::ButtonText, fg_color); + palette.setColor(QPalette::All, QPalette::BrightText, text_color); + +- palette.setColor(QPalette::All, QPalette::Light, QColor("white")); +- palette.setColor(QPalette::All, QPalette::Midlight, QColor("#d7d7d7")); +- palette.setColor(QPalette::All, QPalette::Mid, QColor("#b4b4b4")); +- palette.setColor(QPalette::All, QPalette::Dark, QColor("#1a1a1a")); ++ palette.setColor(QPalette::All, QPalette::Light, _helper->lighten(button_base_color)); ++ palette.setColor(QPalette::All, QPalette::Midlight, _helper->mix(_helper->lighten(button_base_color), button_base_color)); ++ palette.setColor(QPalette::All, QPalette::Mid, _helper->mix(_helper->darken(button_base_color), button_base_color)); ++ palette.setColor(QPalette::All, QPalette::Dark, _helper->darken(button_base_color)); + palette.setColor(QPalette::All, QPalette::Shadow, shadow); + + palette.setColor(QPalette::All, QPalette::Highlight, selected_bg_color); +@@ -654,10 +654,10 @@ void Style::polish(QPalette &palette) + palette.setColor(QPalette::Disabled, QPalette::ButtonText, insensitive_fg_color); + palette.setColor(QPalette::Disabled, QPalette::BrightText, text_color); + +- palette.setColor(QPalette::Disabled, QPalette::Light, QColor("#f4f4f4")); +- palette.setColor(QPalette::Disabled, QPalette::Midlight, QColor("#f4f4f4")); +- palette.setColor(QPalette::Disabled, QPalette::Dark, QColor("#f4f4f4")); +- palette.setColor(QPalette::Disabled, QPalette::Mid, QColor("#c3c3c3")); ++ palette.setColor(QPalette::Disabled, QPalette::Light, _helper->lighten(insensitive_bg_color)); ++ palette.setColor(QPalette::Disabled, QPalette::Midlight, _helper->mix(_helper->lighten(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Disabled, QPalette::Mid, _helper->mix(_helper->darken(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Disabled, QPalette::Dark, _helper->darken(insensitive_bg_color)); + palette.setColor(QPalette::Disabled, QPalette::Shadow, shadow); + + palette.setColor(QPalette::Disabled, QPalette::Highlight, selected_bg_color); +@@ -676,10 +676,10 @@ void Style::polish(QPalette &palette) + palette.setColor(QPalette::Inactive, QPalette::ButtonText, backdrop_fg_color); + palette.setColor(QPalette::Inactive, QPalette::BrightText, text_color); + +- palette.setColor(QPalette::Inactive, QPalette::Light, QColor("white")); +- palette.setColor(QPalette::Inactive, QPalette::Midlight, QColor("#d7d7d7")); +- palette.setColor(QPalette::Inactive, QPalette::Mid, QColor("#b4b4b4")); +- palette.setColor(QPalette::Inactive, QPalette::Dark, QColor("#33393b")); ++ palette.setColor(QPalette::Inactive, QPalette::Light, _helper->lighten(insensitive_bg_color)); ++ palette.setColor(QPalette::Inactive, QPalette::Midlight, _helper->mix(_helper->lighten(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Inactive, QPalette::Mid, _helper->mix(_helper->darken(insensitive_bg_color), insensitive_bg_color)); ++ palette.setColor(QPalette::Inactive, QPalette::Dark, _helper->darken(insensitive_bg_color)); + palette.setColor(QPalette::Inactive, QPalette::Shadow, shadow); + + palette.setColor(QPalette::Inactive, QPalette::Highlight, selected_bg_color); diff --git a/adwaita-qt.spec b/adwaita-qt.spec index 7af607d..88d9a09 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,12 +1,14 @@ Name: adwaita-qt Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Summary: Adwaita theme for Qt-based applications Url: https://github.com/FedoraQt/adwaita-qt Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz +Patch0: adwaita-qt-correct-colors-for-light-midlight-dark-mid.patch + BuildRequires: cmake BuildRequires: qt4-devel @@ -74,6 +76,9 @@ make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5" %files %changelog +* Wed Dec 11 2019 Jan Grulich - 1.1.1-2 +- Set correct Light, Midlight, Dark and Mid colors + * Wed Nov 20 2019 Jan Grulich - 1.1.1-1 - Update to 1.1.1