1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
|
--- src/wingpanel/src/PanelWindow.vala 2016-10-21 23:51:49.434036000 +0900
+++ src/wingpanel/src/PanelWindow.vala.new 2016-10-22 00:21:00.991151961 +0900
@@ -86,7 +86,6 @@
private void on_realize () {
update_panel_dimensions ();
- Services.BackgroundManager.initialize (this.monitor_number, panel_height);
timeout = Timeout.add (100 / panel_height, animation_step);
}
@@ -152,7 +152,6 @@
public void set_expanded (bool expanded) {
if (expand && !this.expanded) {
- Services.BackgroundManager.get_default ().remember_window ();
this.expanded = true;
@@ -163,7 +163,6 @@
this.set_size_request (monitor_width, monitor_height);
} else if (!expand) {
- Services.BackgroundManager.get_default ().restore_window ();
this.expanded = false;
--- src/wingpanel/src/Widgets/Panel.vala 2016-10-22 00:14:45.485792472 +0900
+++ src/wingpanel/src/Widgets/Panel.vala.new 2016-10-22 00:15:13.386112571 +0900
@@ -25,7 +25,6 @@
private MenuBar center_menubar;
private Gtk.StyleContext style_context;
- private Gtk.CssProvider? style_provider = null;
public Panel (Services.PopoverManager popover_manager) {
Object (popover_manager : popover_manager, orientation: Gtk.Orientation.HORIZONTAL);
@@ -60,7 +60,6 @@
style_context = this.get_style_context ();
- Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
}
private void add_indicator (Indicator indicator) {
@@ -228,55 +227,4 @@
}
}
- private void update_background (Services.BackgroundState state, uint animation_duration) {
- if (style_provider == null) {
- style_provider = new Gtk.CssProvider ();
- style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
- }
-
- string css = """
- .panel {
- transition: all %ums ease-in-out;
- }
- """.printf (animation_duration);
-
- try {
- style_provider.load_from_data (css, css.length);
- } catch (Error e) {
- warning ("Parsing own style configuration failed: %s", e.message);
- }
-
- switch (state) {
- case Services.BackgroundState.DARK :
- style_context.add_class ("color-light");
- style_context.remove_class ("color-dark");
- style_context.remove_class ("maximized");
- style_context.remove_class ("translucent");
- break;
- case Services.BackgroundState.LIGHT:
- style_context.add_class ("color-dark");
- style_context.remove_class ("color-light");
- style_context.remove_class ("maximized");
- style_context.remove_class ("translucent");
- break;
- case Services.BackgroundState.MAXIMIZED:
- style_context.add_class ("maximized");
- style_context.remove_class ("color-light");
- style_context.remove_class ("color-dark");
- style_context.remove_class ("translucent");
- break;
- case Services.BackgroundState.TRANSLUCENT_DARK:
- style_context.add_class ("translucent");
- style_context.add_class ("color-light");
- style_context.remove_class ("color-dark");
- style_context.remove_class ("maximized");
- break;
- case Services.BackgroundState.TRANSLUCENT_LIGHT:
- style_context.add_class ("translucent");
- style_context.add_class ("color-dark");
- style_context.remove_class ("color-light");
- style_context.remove_class ("maximized");
- break;
- }
- }
}
--- src/wingpanel/src/CMakeLists.txt 2017-10-13 03:28:23.119421691 +0900
+++ src/wingpanel/src/CMakeLists.txt.new 2017-10-13 03:30:12.838158479 +0900
@@ -10,7 +10,6 @@
Services/IndicatorSorter.vala
Services/PopoverManager.vala
Services/Settings.vala
- Services/BackgroundManager.vala
)
vala_precompile (CLIENT_VALA_C ${CMAKE_PROJECT_NAME}
--- src/wingpanel/src/Services/BackgroundManager.vala 2018-03-04 00:30:27.781440874 +0900
+++ /dev/null 2018-03-03 20:05:09.041298375 +0900
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- */
-
-namespace Wingpanel.Services {
- public enum BackgroundState {
- LIGHT,
- DARK,
- MAXIMIZED,
- TRANSLUCENT_DARK,
- TRANSLUCENT_LIGHT
- }
-
- [DBus (name = "org.pantheon.gala.WingpanelInterface")]
- public interface InterfaceBus : Object {
- public signal void state_changed (BackgroundState state, uint animation_duration);
-
- public abstract void initialize (int monitor, int panel_height) throws IOError;
- public abstract void remember_focused_window () throws IOError;
- public abstract void restore_focused_window () throws IOError;
- }
-
- public class BackgroundManager : Object {
- private const string DBUS_NAME = "org.pantheon.gala.WingpanelInterface";
- private const string DBUS_PATH = "/org/pantheon/gala/WingpanelInterface";
-
- private static BackgroundManager? instance = null;
-
- private InterfaceBus? bus = null;
-
- private BackgroundState current_state = BackgroundState.LIGHT;
- private bool use_transparency = true;
-
- private bool bus_available {
- get {
- return bus != null;
- }
- }
-
- private int monitor;
- private int panel_height;
-
- public signal void background_state_changed (BackgroundState state, uint animation_duration);
-
- public static void initialize (int monitor, int panel_height) {
- var manager = BackgroundManager.get_default ();
- manager.monitor = monitor;
- manager.panel_height = panel_height;
- }
-
- private BackgroundManager () {
- PanelSettings.get_default ().notify["use-transparency"].connect (() => {
- use_transparency = PanelSettings.get_default ().use_transparency;
- state_updated ();
- });
-
- use_transparency = PanelSettings.get_default ().use_transparency;
-
- Bus.watch_name (BusType.SESSION, DBUS_NAME, BusNameWatcherFlags.NONE,
- () => connect_dbus (),
- () => bus = null);
- }
-
- public void remember_window () {
- if (!bus_available) {
- return;
- }
-
- try {
- bus.remember_focused_window ();
- } catch (Error e) {
- warning ("Remembering focused window failed: %s", e.message);
- }
- }
-
- public void restore_window () {
- if (!bus_available) {
- return;
- }
-
- try {
- bus.restore_focused_window ();
- } catch (Error e) {
- warning ("Restoring last focused window failed: %s", e.message);
- }
- }
-
- private bool connect_dbus () {
- try {
- bus = Bus.get_proxy_sync (BusType.SESSION, DBUS_NAME, DBUS_PATH);
- bus.initialize (monitor, panel_height);
- } catch (Error e) {
- warning ("Connecting to \"%s\" failed: %s", DBUS_NAME, e.message);
- return false;
- }
-
- bus.state_changed.connect ((state, animation_duration) => {
- current_state = state;
- state_updated (animation_duration);
- });
-
- state_updated ();
- return true;
- }
-
- private void state_updated (uint animation_duration = 0) {
- background_state_changed (use_transparency ? current_state : BackgroundState.MAXIMIZED, animation_duration);
- }
-
- public static BackgroundManager get_default () {
- if (instance == null) {
- instance = new BackgroundManager ();
- }
-
- return instance;
- }
- }
-}
|