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
|
--- src/wingpanel/src/PanelWindow.vala 2016-10-21 23:51:49.434036000 +0900
+++ src/wingpanel/src/PanelWindow.vala 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 2018-06-04 19:55:35.553769970 +0900
+++ src/wingpanel/src/Widgets/Panel.vala 2018-06-04 21:39:40.293996810 +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);
@@ -64,51 +63,17 @@
});
style_context = this.get_style_context ();
style_context.add_provider (resource_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
- Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
}
public override bool draw (Cairo.Context ctx) {
ctx.translate (0, draw_y);
return base.draw (ctx);
}
static construct {
resource_provider = new Gtk.CssProvider ();
resource_provider.load_from_resource ("io/elementary/wingpanel/panel.css");
- }
-
- public override bool button_press_event (Gdk.EventButton event) {
- if (event.button != Gdk.BUTTON_PRIMARY) {
- return Gdk.EVENT_PROPAGATE;
- }
-
- var window = get_window ();
- if (window == null) {
- return Gdk.EVENT_PROPAGATE;
- }
-
- // Grabbing with touchscreen on X does not work unfortunately
- if (event.device.get_source () == Gdk.InputSource.TOUCHSCREEN) {
- return Gdk.EVENT_PROPAGATE;
- }
-
- uint32 time = event.time;
-
- window.get_display ().get_default_seat ().ungrab ();
-
- Gdk.ModifierType state;
- event.get_state (out state);
-
- popover_manager.close ();
-
- var scale_factor = this.get_scale_factor ();
- var x = (int)event.x_root * scale_factor;
- var y = (int)event.y_root * scale_factor;
-
- var background_manager = Services.BackgroundManager.get_default ();
- return background_manager.begin_grab_focused_window (x, y, (int)event.button, time, state);
}
public void cycle (bool forward) {
@@ -263,56 +229,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/meson.build 2018-12-02 05:25:42.153643446 +0900
+++ src/wingpanel/src/meson.build.new 2018-12-02 05:27:27.293643581 +0900
@@ -1,7 +1,6 @@
wingpanel_files = files(
'Wingpanel.vala',
'PanelWindow.vala',
- 'Services/BackgroundManager.vala',
'Services/IndicatorSorter.vala',
'Services/PopoverManager.vala',
'Services/Settings.vala',
|