@@ -0,0 +1,103 @@
1+From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001
2+From: Bobby Rong <rjl931189261@126.com>
3+Date: Tue, 25 Jan 2022 10:03:31 +0800
4+Subject: [PATCH] Revert "UserCard: use accent color for logged_in check
5+ (#566)"
6+
7+This reverts commit 6f18c79c780582e43039032f6926816efa82e206.
8+---
9+ data/Check.css | 11 -----------
10+ data/greeter.gresource.xml | 1 -
11+ src/Cards/UserCard.vala | 29 +++--------------------------
12+ 3 files changed, 3 insertions(+), 38 deletions(-)
13+ delete mode 100644 data/Check.css
14+
15+diff --git a/data/Check.css b/data/Check.css
16+deleted file mode 100644
17+index 947db6b..0000000
18+--- a/data/Check.css
19++++ /dev/null
20+@@ -1,11 +0,0 @@
21+-check {
22+- background-color: @accent_color;
23+- border-radius: 99px;
24+- color: white;
25+- margin: 2px;
26+- min-height: 20px;
27+- min-width: 20px;
28+- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7);
29+- -gtk-icon-source: -gtk-icontheme("check-active-symbolic");
30+- -gtk-icon-transform: scale(0.6);
31+-}
32+diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml
33+index 604c89a..ce9be29 100644
34+--- a/data/greeter.gresource.xml
35++++ b/data/greeter.gresource.xml
36+@@ -2,7 +2,6 @@
37+ <gresources>
38+ <gresource prefix="/io/elementary/greeter">
39+ <file alias="Card.css" compressed="true">Card.css</file>
40+- <file alias="Check.css" compressed="true">Check.css</file>
41+ <file alias="DateTime.css" compressed="true">DateTime.css</file>
42+ <file alias="MainWindow.css" compressed="true">MainWindow.css</file>
43+ </gresource>
44+diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala
45+index 83df22c..02d2b0a 100644
46+--- a/src/Cards/UserCard.vala
47++++ b/src/Cards/UserCard.vala
48+@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
49+ private Gtk.Stack login_stack;
50+ private Greeter.PasswordEntry password_entry;
51+
52+- private unowned Gtk.StyleContext logged_in_context;
53+ private weak Gtk.StyleContext main_grid_style_context;
54+ private weak Gtk.StyleContext password_entry_context;
55+
56+@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard {
57+ };
58+ avatar_overlay.add (avatar);
59+
60+- var logged_in = new SelectionCheck () {
61+- halign = Gtk.Align.END,
62+- valign = Gtk.Align.END
63+- };
64+-
65+- logged_in_context = logged_in.get_style_context ();
66+-
67+ if (lightdm_user.logged_in) {
68++ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR);
69++ logged_in.halign = logged_in.valign = Gtk.Align.END;
70++
71+ avatar_overlay.add_overlay (logged_in);
72+
73+ session_button.sensitive = false;
74+@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard {
75+ gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color);
76+
77+ var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null);
78+- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
79+ password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
80+ }
81+
82+@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard {
83+ return GLib.Source.REMOVE;
84+ });
85+ }
86+-
87+- private class SelectionCheck : Gtk.Spinner {
88+- private static Gtk.CssProvider check_provider;
89+-
90+- class construct {
91+- set_css_name (Gtk.STYLE_CLASS_CHECK);
92+- }
93+-
94+- static construct {
95+- check_provider = new Gtk.CssProvider ();
96+- check_provider.load_from_resource ("/io/elementary/greeter/Check.css");
97+- }
98+-
99+- construct {
100+- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER);
101+- }
102+- }
103+ }