diff options
Diffstat (limited to '0003-Adwaita-update-the-last-cases-for-checked.patch')
| -rw-r--r-- | 0003-Adwaita-update-the-last-cases-for-checked.patch | 459 |
1 files changed, 459 insertions, 0 deletions
diff --git a/0003-Adwaita-update-the-last-cases-for-checked.patch b/0003-Adwaita-update-the-last-cases-for-checked.patch new file mode 100644 index 0000000..5a79b21 --- /dev/null +++ b/0003-Adwaita-update-the-last-cases-for-checked.patch @@ -0,0 +1,459 @@ +From 9c4af41a59f6bcfd8969e8f597e5e7ed0dec597b Mon Sep 17 00:00:00 2001 +From: Jakub Steiner <jimmac@gmail.com> +Date: Mon, 18 Aug 2014 10:52:52 +0200 +Subject: [PATCH] Adwaita: update the last cases for :checked + +- treeviews can now have the same default checkboxes and radios +- only menus are special (but needed :active -> :checked) + +https://bugzilla.gnome.org/show_bug.cgi?id=733967 +https://bugzilla.gnome.org/show_bug.cgi?id=734290 +--- + gtk/resources/theme/Adwaita/_common.scss | 58 +--------- + gtk/resources/theme/Adwaita/gtk-contained-dark.css | 128 ++++----------------- + gtk/resources/theme/Adwaita/gtk-contained.css | 128 ++++----------------- + 3 files changed, 46 insertions(+), 268 deletions(-) + +diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss +index a81c9eb..0397937 100644 +--- a/gtk/resources/theme/Adwaita/_common.scss ++++ b/gtk/resources/theme/Adwaita/_common.scss +@@ -1658,12 +1658,12 @@ $asset_suffix: if($variant=='dark', '-dark', ''); + } + + //menu +- .menuitem.#{$w} { ++ .menu .menuitem.#{$w} { + color: transparentize($fg_color,0.9); + background-image: none; + -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); + &:hover { color: transparentize($selected_fg_color,0.9); } +- &:active { ++ &:checked { + color: $fg_color; + &:hover { + -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); +@@ -1690,60 +1690,6 @@ $asset_suffix: if($variant=='dark', '-dark', ''); + color: transparentize($backdrop_fg_color,0.9); + } + } +- +- //treeview & selection mode icon view +- .view.#{$w} { +- // FIXME .cell.check/.radio doesn't needs to be blue in bright var +- color: transparentize($fg_color,0.9); +- background-image: none; +- -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); +- &:hover { -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); } +- &:active { +- color: $fg_color; +- &:insensitive { +- color: $insensitive_fg_color; +- &:backdrop { color: $backdrop_insensitive_color; } +- } +- &:backdrop { color: $backdrop_fg_color; } +- } +- &:insensitive { +- color: transparentize($insensitive_fg_color,0.9); +- &:backdrop { color: transparent; } +- } +- &:inconsistent { +- -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic'); +- } +- &:selected, &:selected:focus { +- // -gtk-icon-source needed it gets overridden +- -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); +- // :selected:focus not to get overridden by .view style +- color: transparentize($selected_fg_color,0.9); +- &:active { +- color: $selected_fg_color; +- &:backdrop { +- color: if($variant=='light',$backdrop_base_color,$backdrop_fg_color); +- } +- } +- } +- &:backdrop { +- // -gtk-icon-source needed it gets overridden +- -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic'); +- color: transparentize($backdrop_fg_color,0.9); +- &:selected { color: transparentize($backdrop_base_color,0.9); } +- } +- } +- +- //popover +- .popover .button.#{$w} { +- &:hover { +- color: transparentize($fg_color,0.9); +- &:active { +- color: $fg_color; +- &:selected { color: $selected_fg_color; } +- &:backdrop { color: $backdrop_fg_color; } +- } +- } +- } + } + + GtkCheckButton.text-button, GtkRadioButton.text-button { +diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css +index ef47844..df7581a 100644 +--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css ++++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css +@@ -1781,76 +1781,34 @@ GtkSwitch { + .check:backdrop:checked:insensitive { + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png")); } + +-.menuitem.check { ++.menu .menuitem.check { + color: rgba(238, 238, 236, 0.1); + background-image: none; + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } +- .menuitem.check:hover { ++ .menu .menuitem.check:hover { + color: rgba(255, 255, 255, 0.1); } +- .menuitem.check:active { ++ .menu .menuitem.check:checked { + color: #eeeeec; } +- .menuitem.check:active:hover { ++ .menu .menuitem.check:checked:hover { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + color: white; } +- .menuitem.check:active:insensitive { ++ .menu .menuitem.check:checked:insensitive { + color: #939695; + background-image: none; } +- .menuitem.check:active:insensitive:backdrop { ++ .menu .menuitem.check:checked:insensitive:backdrop { + color: #5d6767; } +- .menuitem.check:active:backdrop { ++ .menu .menuitem.check:checked:backdrop { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + color: #c9cbc9; } +- .menuitem.check:insensitive { ++ .menu .menuitem.check:insensitive { + color: rgba(147, 150, 149, 0.1); } +- .menuitem.check:insensitive:backdrop { ++ .menu .menuitem.check:insensitive:backdrop { + color: transparent; } +- .menuitem.check:inconsistent { ++ .menu .menuitem.check:inconsistent { + -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } +- .menuitem.check:backdrop, .menuitem.check:backdrop:hover { ++ .menu .menuitem.check:backdrop, .menu .menuitem.check:backdrop:hover { + color: rgba(201, 203, 201, 0.1); } + +-.view.check { +- color: rgba(238, 238, 236, 0.1); +- background-image: none; +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } +- .view.check:hover { +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } +- .view.check:active { +- color: #eeeeec; } +- .view.check:active:insensitive { +- color: #939695; } +- .view.check:active:insensitive:backdrop { +- color: #5d6767; } +- .view.check:active:backdrop { +- color: #c9cbc9; } +- .view.check:insensitive { +- color: rgba(147, 150, 149, 0.1); } +- .view.check:insensitive:backdrop { +- color: transparent; } +- .view.check:inconsistent { +- -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } +- .view.check:selected, .view.check:selected:focus { +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); +- color: rgba(255, 255, 255, 0.1); } +- .view.check:selected:active, .view.check:selected:focus:active { +- color: white; } +- .view.check:selected:active:backdrop, .view.check:selected:focus:active:backdrop { +- color: #c9cbc9; } +- .view.check:backdrop { +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); +- color: rgba(201, 203, 201, 0.1); } +- .view.check:backdrop:selected { +- color: rgba(44, 44, 44, 0.1); } +- +-.popover .button.check:hover { +- color: rgba(238, 238, 236, 0.1); } +- .popover .button.check:hover:active { +- color: #eeeeec; } +- .popover .button.check:hover:active:selected { +- color: white; } +- .popover .button.check:hover:active:backdrop { +- color: #c9cbc9; } +- + .radio { + -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); } + +@@ -1905,76 +1863,34 @@ GtkSwitch { + .radio:backdrop:checked:insensitive { + -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png")); } + +-.menuitem.radio { ++.menu .menuitem.radio { + color: rgba(238, 238, 236, 0.1); + background-image: none; + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } +- .menuitem.radio:hover { ++ .menu .menuitem.radio:hover { + color: rgba(255, 255, 255, 0.1); } +- .menuitem.radio:active { ++ .menu .menuitem.radio:checked { + color: #eeeeec; } +- .menuitem.radio:active:hover { ++ .menu .menuitem.radio:checked:hover { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + color: white; } +- .menuitem.radio:active:insensitive { ++ .menu .menuitem.radio:checked:insensitive { + color: #939695; + background-image: none; } +- .menuitem.radio:active:insensitive:backdrop { ++ .menu .menuitem.radio:checked:insensitive:backdrop { + color: #5d6767; } +- .menuitem.radio:active:backdrop { ++ .menu .menuitem.radio:checked:backdrop { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + color: #c9cbc9; } +- .menuitem.radio:insensitive { ++ .menu .menuitem.radio:insensitive { + color: rgba(147, 150, 149, 0.1); } +- .menuitem.radio:insensitive:backdrop { ++ .menu .menuitem.radio:insensitive:backdrop { + color: transparent; } +- .menuitem.radio:inconsistent { ++ .menu .menuitem.radio:inconsistent { + -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } +- .menuitem.radio:backdrop, .menuitem.radio:backdrop:hover { ++ .menu .menuitem.radio:backdrop, .menu .menuitem.radio:backdrop:hover { + color: rgba(201, 203, 201, 0.1); } + +-.view.radio { +- color: rgba(238, 238, 236, 0.1); +- background-image: none; +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } +- .view.radio:hover { +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } +- .view.radio:active { +- color: #eeeeec; } +- .view.radio:active:insensitive { +- color: #939695; } +- .view.radio:active:insensitive:backdrop { +- color: #5d6767; } +- .view.radio:active:backdrop { +- color: #c9cbc9; } +- .view.radio:insensitive { +- color: rgba(147, 150, 149, 0.1); } +- .view.radio:insensitive:backdrop { +- color: transparent; } +- .view.radio:inconsistent { +- -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } +- .view.radio:selected, .view.radio:selected:focus { +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); +- color: rgba(255, 255, 255, 0.1); } +- .view.radio:selected:active, .view.radio:selected:focus:active { +- color: white; } +- .view.radio:selected:active:backdrop, .view.radio:selected:focus:active:backdrop { +- color: #c9cbc9; } +- .view.radio:backdrop { +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); +- color: rgba(201, 203, 201, 0.1); } +- .view.radio:backdrop:selected { +- color: rgba(44, 44, 44, 0.1); } +- +-.popover .button.radio:hover { +- color: rgba(238, 238, 236, 0.1); } +- .popover .button.radio:hover:active { +- color: #eeeeec; } +- .popover .button.radio:hover:active:selected { +- color: white; } +- .popover .button.radio:hover:active:backdrop { +- color: #c9cbc9; } +- + GtkCheckButton.text-button, GtkRadioButton.text-button { + padding: 1px 2px 4px; + outline-offset: 0; } +diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css +index 0f244ab..585c1aa 100644 +--- a/gtk/resources/theme/Adwaita/gtk-contained.css ++++ b/gtk/resources/theme/Adwaita/gtk-contained.css +@@ -1776,76 +1776,34 @@ GtkSwitch { + .check:backdrop:checked:insensitive { + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png")); } + +-.menuitem.check { ++.menu .menuitem.check { + color: rgba(46, 52, 54, 0.1); + background-image: none; + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } +- .menuitem.check:hover { ++ .menu .menuitem.check:hover { + color: rgba(255, 255, 255, 0.1); } +- .menuitem.check:active { ++ .menu .menuitem.check:checked { + color: #2e3436; } +- .menuitem.check:active:hover { ++ .menu .menuitem.check:checked:hover { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + color: white; } +- .menuitem.check:active:insensitive { ++ .menu .menuitem.check:checked:insensitive { + color: #8d9091; + background-image: none; } +- .menuitem.check:active:insensitive:backdrop { ++ .menu .menuitem.check:checked:insensitive:backdrop { + color: #c7c7c7; } +- .menuitem.check:active:backdrop { ++ .menu .menuitem.check:checked:backdrop { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + color: #54595a; } +- .menuitem.check:insensitive { ++ .menu .menuitem.check:insensitive { + color: rgba(141, 144, 145, 0.1); } +- .menuitem.check:insensitive:backdrop { ++ .menu .menuitem.check:insensitive:backdrop { + color: transparent; } +- .menuitem.check:inconsistent { ++ .menu .menuitem.check:inconsistent { + -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } +- .menuitem.check:backdrop, .menuitem.check:backdrop:hover { ++ .menu .menuitem.check:backdrop, .menu .menuitem.check:backdrop:hover { + color: rgba(84, 89, 90, 0.1); } + +-.view.check { +- color: rgba(46, 52, 54, 0.1); +- background-image: none; +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } +- .view.check:hover { +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); } +- .view.check:active { +- color: #2e3436; } +- .view.check:active:insensitive { +- color: #8d9091; } +- .view.check:active:insensitive:backdrop { +- color: #c7c7c7; } +- .view.check:active:backdrop { +- color: #54595a; } +- .view.check:insensitive { +- color: rgba(141, 144, 145, 0.1); } +- .view.check:insensitive:backdrop { +- color: transparent; } +- .view.check:inconsistent { +- -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } +- .view.check:selected, .view.check:selected:focus { +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); +- color: rgba(255, 255, 255, 0.1); } +- .view.check:selected:active, .view.check:selected:focus:active { +- color: white; } +- .view.check:selected:active:backdrop, .view.check:selected:focus:active:backdrop { +- color: #fcfcfc; } +- .view.check:backdrop { +- -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); +- color: rgba(84, 89, 90, 0.1); } +- .view.check:backdrop:selected { +- color: rgba(252, 252, 252, 0.1); } +- +-.popover .button.check:hover { +- color: rgba(46, 52, 54, 0.1); } +- .popover .button.check:hover:active { +- color: #2e3436; } +- .popover .button.check:hover:active:selected { +- color: white; } +- .popover .button.check:hover:active:backdrop { +- color: #54595a; } +- + .radio { + -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png")); } + +@@ -1900,76 +1858,34 @@ GtkSwitch { + .radio:backdrop:checked:insensitive { + -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png")); } + +-.menuitem.radio { ++.menu .menuitem.radio { + color: rgba(46, 52, 54, 0.1); + background-image: none; + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } +- .menuitem.radio:hover { ++ .menu .menuitem.radio:hover { + color: rgba(255, 255, 255, 0.1); } +- .menuitem.radio:active { ++ .menu .menuitem.radio:checked { + color: #2e3436; } +- .menuitem.radio:active:hover { ++ .menu .menuitem.radio:checked:hover { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + color: white; } +- .menuitem.radio:active:insensitive { ++ .menu .menuitem.radio:checked:insensitive { + color: #8d9091; + background-image: none; } +- .menuitem.radio:active:insensitive:backdrop { ++ .menu .menuitem.radio:checked:insensitive:backdrop { + color: #c7c7c7; } +- .menuitem.radio:active:backdrop { ++ .menu .menuitem.radio:checked:backdrop { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + color: #54595a; } +- .menuitem.radio:insensitive { ++ .menu .menuitem.radio:insensitive { + color: rgba(141, 144, 145, 0.1); } +- .menuitem.radio:insensitive:backdrop { ++ .menu .menuitem.radio:insensitive:backdrop { + color: transparent; } +- .menuitem.radio:inconsistent { ++ .menu .menuitem.radio:inconsistent { + -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } +- .menuitem.radio:backdrop, .menuitem.radio:backdrop:hover { ++ .menu .menuitem.radio:backdrop, .menu .menuitem.radio:backdrop:hover { + color: rgba(84, 89, 90, 0.1); } + +-.view.radio { +- color: rgba(46, 52, 54, 0.1); +- background-image: none; +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } +- .view.radio:hover { +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); } +- .view.radio:active { +- color: #2e3436; } +- .view.radio:active:insensitive { +- color: #8d9091; } +- .view.radio:active:insensitive:backdrop { +- color: #c7c7c7; } +- .view.radio:active:backdrop { +- color: #54595a; } +- .view.radio:insensitive { +- color: rgba(141, 144, 145, 0.1); } +- .view.radio:insensitive:backdrop { +- color: transparent; } +- .view.radio:inconsistent { +- -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } +- .view.radio:selected, .view.radio:selected:focus { +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); +- color: rgba(255, 255, 255, 0.1); } +- .view.radio:selected:active, .view.radio:selected:focus:active { +- color: white; } +- .view.radio:selected:active:backdrop, .view.radio:selected:focus:active:backdrop { +- color: #fcfcfc; } +- .view.radio:backdrop { +- -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); +- color: rgba(84, 89, 90, 0.1); } +- .view.radio:backdrop:selected { +- color: rgba(252, 252, 252, 0.1); } +- +-.popover .button.radio:hover { +- color: rgba(46, 52, 54, 0.1); } +- .popover .button.radio:hover:active { +- color: #2e3436; } +- .popover .button.radio:hover:active:selected { +- color: white; } +- .popover .button.radio:hover:active:backdrop { +- color: #54595a; } +- + GtkCheckButton.text-button, GtkRadioButton.text-button { + padding: 1px 2px 4px; + outline-offset: 0; } +-- +2.1.0 + |