Skip to content

Commit af40560

Browse files
authored
Merge branch 'main' into leolost/window-clone-allocate-warnings
2 parents f1c9964 + 6f621bc commit af40560

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+7870
-7860
lines changed

data/gala.metainfo.xml.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30-
<release version="8.3.0" date="2025-10-28" urgency="medium">
30+
<release version="8.3.0" date="2025-11-05" urgency="medium">
3131
<description>
3232
<p>Improvements:</p>
3333
<ul>
@@ -40,10 +40,12 @@
4040
</ul>
4141
</description>
4242
<issues>
43+
<issue url="https://github.com/elementary/gala/issues/335">Close button isn't always on top</issue>
4344
<issue url="https://github.com/elementary/gala/issues/501">Tiled and maximized widows show different behaviour on wingpanel when in front of fullscreen windows</issue>
4445
<issue url="https://github.com/elementary/gala/issues/1385">Urgent notifications can get offset</issue>
4546
<issue url="https://github.com/elementary/gala/issues/1998">Blur Behind</issue>
4647
<issue url="https://github.com/elementary/gala/issues/2057">Trying to change desktop bg to a color don´t work</issue>
48+
<issue url="https://github.com/elementary/gala/issues/2071">Dock overlapping right-click menu on elementary OS 8</issue>
4749
<issue url="https://github.com/elementary/gala/issues/2079">Gala app icon shows up in Dock briefly</issue>
4850
<issue url="https://github.com/elementary/gala/issues/2333">Wingpanel crashes than reappears in the middle of the screen</issue>
4951
<issue url="https://github.com/elementary/gala/issues/2399">Horizontal swipe to switch workspace no longer follows natural scrolling setting</issue>
@@ -55,7 +57,7 @@
5557
<issue url="https://github.com/elementary/gala/issues/2507">Logs filled with assertion fails / failure messages</issue>
5658
<issue url="https://github.com/elementary/gala/issues/2515">Main window is being resized to dialog/child window size after reopen</issue>
5759
<issue url="https://github.com/elementary/gala/issues/2530">Freezing minimized windows</issue>
58-
<issue url="https://github.com/elementary/dock/discussions/478">Dock is shown over fullscreen apps</issue>
60+
<issue url="https://github.com/elementary/dock/issues/479">Dock is shown over fullscreen apps</issue>
5961
<issue url="https://github.com/elementary/wingpanel/issues/639">Wingpanel starts at middle of the screen</issue>
6062
</issues>
6163
</release>

lib/CloseButton.vala

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ public class Gala.CloseButton : Clutter.Actor {
88
private static Gee.HashMap<int, Gdk.Pixbuf?> close_pixbufs;
99

1010
public signal void triggered (uint32 timestamp);
11-
public float scale { get; construct set; }
11+
12+
public float monitor_scale { get; construct set; }
1213

1314
// used to avoid changing hitbox of the button
1415
private Clutter.Actor pixbuf_actor;
1516
private bool is_pressed = false;
1617

17-
public CloseButton (float scale) {
18-
Object (scale: scale);
19-
}
20-
2118
static construct {
2219
close_pixbufs = new Gee.HashMap<int, Gdk.Pixbuf?> ();
2320
}
2421

22+
public CloseButton (float monitor_scale) {
23+
Object (monitor_scale: monitor_scale);
24+
}
25+
2526
construct {
2627
reactive = true;
2728

@@ -30,23 +31,24 @@ public class Gala.CloseButton : Clutter.Actor {
3031
};
3132
add_child (pixbuf_actor);
3233

33-
var pixbuf = get_close_button_pixbuf (scale);
34+
load_pixbuf ();
35+
notify["monitor-scale"].connect (load_pixbuf);
36+
}
37+
38+
private void load_pixbuf () {
39+
var pixbuf = get_close_button_pixbuf (monitor_scale);
3440
if (pixbuf != null) {
35-
try {
36-
var image = new Gala.Image.from_pixbuf (pixbuf);
37-
pixbuf_actor.set_content (image);
38-
pixbuf_actor.set_size (pixbuf.width, pixbuf.height);
39-
set_size (pixbuf.width, pixbuf.height);
40-
} catch (Error e) {
41-
create_error_texture ();
42-
}
41+
var image = new Gala.Image.from_pixbuf (pixbuf);
42+
pixbuf_actor.set_content (image);
43+
pixbuf_actor.set_size (pixbuf.width, pixbuf.height);
44+
set_size (pixbuf.width, pixbuf.height);
4345
} else {
4446
create_error_texture ();
4547
}
4648
}
4749

48-
private static Gdk.Pixbuf? get_close_button_pixbuf (float scale) {
49-
var height = Utils.calculate_button_size (scale);
50+
private static Gdk.Pixbuf? get_close_button_pixbuf (float monitor_scale) {
51+
var height = Utils.calculate_button_size (monitor_scale);
5052

5153
if (close_pixbufs[height] == null) {
5254
try {
@@ -71,7 +73,7 @@ public class Gala.CloseButton : Clutter.Actor {
7173
// works as good as some weird fallback-image-failed-to-load pixbuf
7274
critical ("Could not create close button");
7375

74-
var size = Utils.calculate_button_size (scale);
76+
var size = Utils.calculate_button_size (monitor_scale);
7577
pixbuf_actor.set_size (size, size);
7678
pixbuf_actor.background_color = { 255, 0, 0, 255 };
7779
}

lib/Drawing/StyleManager.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class Gala.Drawing.StyleManager : Object {
3333
private const uint8 ACCENT_COLOR_ALPHA = 64;
3434

3535
private static GLib.Once<StyleManager> instance;
36-
public static StyleManager get_instance () {
36+
public static unowned StyleManager get_instance () {
3737
return instance.once (() => new StyleManager ());
3838
}
3939

lib/Gestures/GestureController.vala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public class Gala.GestureController : Object {
6464

6565
/**
6666
* When disabled gesture progress will stay where the gesture ended and not snap to full integers values.
67-
* This will also cause the controller to emit smooth progress information even if animations are disabled.
6867
*/
6968
public bool snap { get; construct set; default = true; }
7069

@@ -173,12 +172,6 @@ public class Gala.GestureController : Object {
173172
direction_multiplier *= -1;
174173
}
175174

176-
if (snap && !Meta.Prefs.get_gnome_animations ()) {
177-
recognizing = false;
178-
prepare ();
179-
finish (0, progress + direction_multiplier);
180-
}
181-
182175
recognizing_backend = backend;
183176
}
184177

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('gala',
22
'vala',
3-
version: '8.2.5',
3+
version: '8.3.0',
44
meson_version: '>= 0.59.0',
55
license: 'GPL3',
66
)

po/aa.po

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: gala 3.2.0\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
10-
"POT-Creation-Date: 2025-10-28 21:49+0000\n"
10+
"POT-Creation-Date: 2025-11-05 20:49+0000\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -102,25 +102,25 @@ msgstr ""
102102
msgid "elementary, Inc."
103103
msgstr ""
104104

105-
#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:65
106-
#: data/gala.metainfo.xml.in:77 data/gala.metainfo.xml.in:92
107-
#: data/gala.metainfo.xml.in:118 data/gala.metainfo.xml.in:130
108-
#: data/gala.metainfo.xml.in:144 data/gala.metainfo.xml.in:177
109-
#: data/gala.metainfo.xml.in:208 data/gala.metainfo.xml.in:221
110-
#: data/gala.metainfo.xml.in:236 data/gala.metainfo.xml.in:253
111-
#: data/gala.metainfo.xml.in:269 data/gala.metainfo.xml.in:310
112-
#: data/gala.metainfo.xml.in:335 data/gala.metainfo.xml.in:351
113-
msgid "Improvements:"
114-
msgstr ""
115-
116-
#: data/gala.metainfo.xml.in:34 data/gala.metainfo.xml.in:67
105+
#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:67
117106
#: data/gala.metainfo.xml.in:79 data/gala.metainfo.xml.in:94
118107
#: data/gala.metainfo.xml.in:120 data/gala.metainfo.xml.in:132
119108
#: data/gala.metainfo.xml.in:146 data/gala.metainfo.xml.in:179
120109
#: data/gala.metainfo.xml.in:210 data/gala.metainfo.xml.in:223
121-
#: data/gala.metainfo.xml.in:238 data/gala.metainfo.xml.in:257
122-
#: data/gala.metainfo.xml.in:273 data/gala.metainfo.xml.in:316
123-
#: data/gala.metainfo.xml.in:338 data/gala.metainfo.xml.in:353
110+
#: data/gala.metainfo.xml.in:238 data/gala.metainfo.xml.in:255
111+
#: data/gala.metainfo.xml.in:271 data/gala.metainfo.xml.in:312
112+
#: data/gala.metainfo.xml.in:337 data/gala.metainfo.xml.in:353
113+
msgid "Improvements:"
114+
msgstr ""
115+
116+
#: data/gala.metainfo.xml.in:34 data/gala.metainfo.xml.in:69
117+
#: data/gala.metainfo.xml.in:81 data/gala.metainfo.xml.in:96
118+
#: data/gala.metainfo.xml.in:122 data/gala.metainfo.xml.in:134
119+
#: data/gala.metainfo.xml.in:148 data/gala.metainfo.xml.in:181
120+
#: data/gala.metainfo.xml.in:212 data/gala.metainfo.xml.in:225
121+
#: data/gala.metainfo.xml.in:240 data/gala.metainfo.xml.in:259
122+
#: data/gala.metainfo.xml.in:275 data/gala.metainfo.xml.in:318
123+
#: data/gala.metainfo.xml.in:340 data/gala.metainfo.xml.in:355
124124
msgid "Updated translations"
125125
msgstr ""
126126

@@ -144,69 +144,69 @@ msgstr ""
144144
msgid "Picture-in-Picture windows now have rounded corners"
145145
msgstr ""
146146

147-
#: data/gala.metainfo.xml.in:147
147+
#: data/gala.metainfo.xml.in:149
148148
msgid "Window state is now saved on sleep and shutdown"
149149
msgstr ""
150150

151-
#: data/gala.metainfo.xml.in:148
151+
#: data/gala.metainfo.xml.in:150
152152
msgid "Remove scaling effect from menus"
153153
msgstr ""
154154

155-
#: data/gala.metainfo.xml.in:149
155+
#: data/gala.metainfo.xml.in:151
156156
msgid "Swipe up to close windows in Multitasking View"
157157
msgstr ""
158158

159-
#: data/gala.metainfo.xml.in:180
159+
#: data/gala.metainfo.xml.in:182
160160
msgid "Fixed rare crash when a dock window was killed"
161161
msgstr ""
162162

163-
#: data/gala.metainfo.xml.in:181
163+
#: data/gala.metainfo.xml.in:183
164164
msgid "Added interactive screenshot shortcut"
165165
msgstr ""
166166

167-
#: data/gala.metainfo.xml.in:182
167+
#: data/gala.metainfo.xml.in:184
168168
msgid "Fixed crash when using tiling shortcuts"
169169
msgstr ""
170170

171-
#: data/gala.metainfo.xml.in:211
171+
#: data/gala.metainfo.xml.in:213
172172
msgid "Improved shadows performance"
173173
msgstr ""
174174

175-
#: data/gala.metainfo.xml.in:255
175+
#: data/gala.metainfo.xml.in:257
176176
msgid "Fix a potential crash when moving windows between workspaces"
177177
msgstr ""
178178

179-
#: data/gala.metainfo.xml.in:256
179+
#: data/gala.metainfo.xml.in:258
180180
msgid "Fix notification animation when entering multitasking view"
181181
msgstr ""
182182

183-
#: data/gala.metainfo.xml.in:271
183+
#: data/gala.metainfo.xml.in:273
184184
msgid "Improve keyboard navigation in Multitasking View"
185185
msgstr ""
186186

187-
#: data/gala.metainfo.xml.in:272
187+
#: data/gala.metainfo.xml.in:274
188188
msgid "Change panel color at the same time as wallpaper transition"
189189
msgstr ""
190190

191-
#: data/gala.metainfo.xml.in:312
191+
#: data/gala.metainfo.xml.in:314
192192
msgid ""
193193
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
194194
"option"
195195
msgstr ""
196196

197-
#: data/gala.metainfo.xml.in:313
197+
#: data/gala.metainfo.xml.in:315
198198
msgid "Use appropriate drag-and-drop pointers when moving windows"
199199
msgstr ""
200200

201-
#: data/gala.metainfo.xml.in:314
201+
#: data/gala.metainfo.xml.in:316
202202
msgid "Fix the issue when gestures in the multitasking view might stop working"
203203
msgstr ""
204204

205-
#: data/gala.metainfo.xml.in:315
205+
#: data/gala.metainfo.xml.in:317
206206
msgid "Improve dynamic workspaces behaviour with multiple monitors"
207207
msgstr ""
208208

209-
#: data/gala.metainfo.xml.in:337
209+
#: data/gala.metainfo.xml.in:339
210210
msgid "Improve handling of move-to-workspace shortcut"
211211
msgstr ""
212212

@@ -308,25 +308,25 @@ msgstr ""
308308
msgid "Screenshots"
309309
msgstr ""
310310

311-
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:80
311+
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:78
312312
msgid "Window switcher"
313313
msgstr ""
314314

315-
#: src/WindowManager.vala:1719
315+
#: src/WindowManager.vala:1739
316316
#, c-format
317317
msgid "Changes will automatically revert after %i second."
318318
msgid_plural "Changes will automatically revert after %i seconds."
319319
msgstr[0] ""
320320
msgstr[1] ""
321321

322-
#: src/WindowManager.vala:1726
322+
#: src/WindowManager.vala:1746
323323
msgid "Keep new display settings?"
324324
msgstr ""
325325

326-
#: src/WindowManager.vala:1730
326+
#: src/WindowManager.vala:1750
327327
msgid "Keep Settings"
328328
msgstr ""
329329

330-
#: src/WindowManager.vala:1731
330+
#: src/WindowManager.vala:1751
331331
msgid "Use Previous Settings"
332332
msgstr ""

0 commit comments

Comments
 (0)