rpms/adwaita-qt
5
0
Fork 0
Code Issues Pull Requests Releases Activity

1.1.2

Browse Source
This commit is contained in:
Jan Grulich 2020-05-11 20:51:14 +02:00
parent 0263bf979e
commit 9909446b4f
4 changed files with 7 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,3 +9,4 @@
/adwaita-qt-1.0.91.tar.gz
/adwaita-qt-1.1.0.tar.gz
/adwaita-qt-1.1.1.tar.gz
/adwaita-qt-1.1.2.tar.gz

94
adwaita-qt-correct-colors-for-light-midlight-dark-mid.patch
View File

@ -1,94 +0,0 @@
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);

9
adwaita-qt.spec
View File

@ -1,14 +1,12 @@
Name: adwaita-qt
Version: 1.1.1
Release: 3%{?dist}
Version: 1.1.2
Release: 1%{?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
@ -76,6 +74,9 @@ make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5"
%files
%changelog
* Mon May 11 2020 Jan Grulich <jgrulich@redhat.com> - 1.1.2-1
- 1.1.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (adwaita-qt-1.1.1.tar.gz) = 6d11fc8eecc94da4f2e3798ee5147258f277032b23a82d5bf8d3414943ac89c5ebd056d519338959c72a8a45d1638ab8cfeac01b3f3fd1118b4c89eb0c8b5608
SHA512 (adwaita-qt-1.1.2.tar.gz) = 7dc5830b7ad3811fea8ee94671668c9cf17f7dbc27584a05c1ff4cc55387d6b7bb5208b8dba836a7f10c09a3d6e6706c95eebd01eadb0caec6b5653920c44b27