[gtk/wip/jimmac/insensitive-progress] Adwaita: draw insensitive progressbars
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/insensitive-progress] Adwaita: draw insensitive progressbars
- Date: Wed, 26 Sep 2018 20:43:06 +0000 (UTC)
commit 24d7538a2fc8ac8a9d9e275cc9fac5521060db34
Author: Jakub Steiner <jimmac gmail com>
Date: Wed Sep 26 22:41:27 2018 +0200
Adwaita: draw insensitive progressbars
- keep inheriting stuff from scales, but
do draw highlights
Addresses issue 1191
gtk/theme/Adwaita/_common.scss | 13 ++++++++++++-
gtk/theme/Adwaita/gtk-contained-dark.css | 6 +++++-
gtk/theme/Adwaita/gtk-contained.css | 6 +++++-
3 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 5fd176598b..cd6b249fe3 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3388,7 +3388,18 @@ progressbar {
trough { @extend %scale_trough; }
progress {
- @extend %scale_highlight;
+ @extend %scale_highlight; /* share most of scales' */
+ /* override insensitive that is specific to progress */
+ &:disabled {
+ background-color: $insensitive_fg_color;
+ border-color: $insensitive_fg_color;
+ }
+
+ &:backdrop:disabled {
+ background-color: $backdrop_insensitive_color;
+ border-color: $backdrop_insensitive_color;
+ }
+
border-radius: 1.5px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 4b362f5505..89da86e2c9 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1470,7 +1470,11 @@ progressbar.vertical progress { margin: -1px 0; }
progressbar:backdrop { box-shadow: none; transition: 200ms ease-out; }
-progressbar progress { border-radius: 1.5px; }
+progressbar progress { /* share most of scales' */ /* override insensitive that is specific to progress */
border-radius: 1.5px; }
+
+progressbar progress:disabled { background-color: #919494; border-color: #919494; }
+
+progressbar progress:backdrop:disabled { background-color: #566164; border-color: #566164; }
progressbar progress.left { border-top-left-radius: 2px; border-bottom-left-radius: 2px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 67aef82932..3e512a6c69 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1490,7 +1490,11 @@ progressbar.vertical progress { margin: -1px 0; }
progressbar:backdrop { box-shadow: none; transition: 200ms ease-out; }
-progressbar progress { border-radius: 1.5px; }
+progressbar progress { /* share most of scales' */ /* override insensitive that is specific to progress */
border-radius: 1.5px; }
+
+progressbar progress:disabled { background-color: #8b8e8f; border-color: #8b8e8f; }
+
+progressbar progress:backdrop:disabled { background-color: #c3c3c0; border-color: #c3c3c0; }
progressbar progress.left { border-top-left-radius: 2px; border-bottom-left-radius: 2px; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]