Skip to content

Commit f9f57b0

Browse files
authored
Merge branch 'main' into lenemter/release-8.3.0
2 parents 8280c83 + c40b3ea commit f9f57b0

File tree

13 files changed

+165
-162
lines changed

13 files changed

+165
-162
lines changed

data/gala.metainfo.xml.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

po/ca.po

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-10-28 21:49+0000\n"
11-
"PO-Revision-Date: 2025-06-05 07:55+0000\n"
11+
"PO-Revision-Date: 2025-10-31 09:55+0000\n"
1212
"Last-Translator: David M <[email protected]>\n"
1313
"Language-Team: Catalan <https://l10n.elementaryos.org/projects/desktop/gala/"
1414
"ca/>\n"
@@ -132,27 +132,23 @@ msgstr "Traduccions actualitzades"
132132

133133
#: data/gala.metainfo.xml.in:35
134134
msgid "Improved HiDPI support"
135-
msgstr ""
135+
msgstr "Suport per a HiDPI millorat"
136136

137137
#: data/gala.metainfo.xml.in:36
138-
#, fuzzy
139-
#| msgid "Improved shadows performance"
140138
msgid "Improved render performance"
141-
msgstr "Rendiment de les ombres millorat"
139+
msgstr "Rendiment de renderització millorat"
142140

143141
#: data/gala.metainfo.xml.in:37
144142
msgid "Reveal dock and panel in sync when starting"
145-
msgstr ""
143+
msgstr "Revelació de l'acoblador i el plafó sincronitzats a l'inici"
146144

147145
#: data/gala.metainfo.xml.in:38
148-
#, fuzzy
149-
#| msgid "Duration of the workspace switch animation"
150146
msgid "Improved workspace switch dock animation"
151-
msgstr "Durada de l'animació del canvi d'espai de treball"
147+
msgstr "Animació millorada de l'acoblador per canviar l'espai de treball"
152148

153149
#: data/gala.metainfo.xml.in:39
154150
msgid "Picture-in-Picture windows now have rounded corners"
155-
msgstr ""
151+
msgstr "Les finestres d'imatge dins d'imatge ara tenen cantonades arrodonides."
156152

157153
#: data/gala.metainfo.xml.in:147
158154
msgid "Window state is now saved on sleep and shutdown"

po/fr.po

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: gala\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-10-28 21:49+0000\n"
11-
"PO-Revision-Date: 2025-06-05 07:55+0000\n"
11+
"PO-Revision-Date: 2025-10-30 06:55+0000\n"
1212
"Last-Translator: Nathan <[email protected]>\n"
1313
"Language-Team: French <https://l10n.elementaryos.org/projects/desktop/gala/"
1414
"fr/>\n"
@@ -133,27 +133,23 @@ msgstr "Mise à jour des traductions"
133133

134134
#: data/gala.metainfo.xml.in:35
135135
msgid "Improved HiDPI support"
136-
msgstr ""
136+
msgstr "Amélioration de la prise en charge HiDPI"
137137

138138
#: data/gala.metainfo.xml.in:36
139-
#, fuzzy
140-
#| msgid "Improved shadows performance"
141139
msgid "Improved render performance"
142-
msgstr "Amélioration des performances des ombres"
140+
msgstr "Amélioration des performances de rendu"
143141

144142
#: data/gala.metainfo.xml.in:37
145143
msgid "Reveal dock and panel in sync when starting"
146-
msgstr ""
144+
msgstr "Affichage du dock et du panneau de façon synchrone au démarrage"
147145

148146
#: data/gala.metainfo.xml.in:38
149-
#, fuzzy
150-
#| msgid "Duration of the workspace switch animation"
151147
msgid "Improved workspace switch dock animation"
152-
msgstr "Durée de l'animation de changement d'espace de travail"
148+
msgstr "Amélioration de l'animation du dock au changement d'espace de travail"
153149

154150
#: data/gala.metainfo.xml.in:39
155151
msgid "Picture-in-Picture windows now have rounded corners"
156-
msgstr ""
152+
msgstr "Les fenêtres Picture-in-Picture ont désormais des coins arrondis"
157153

158154
#: data/gala.metainfo.xml.in:147
159155
msgid "Window state is now saved on sleep and shutdown"

po/he.po

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgstr ""
33
"Project-Id-Version: PACKAGE VERSION\n"
44
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
55
"POT-Creation-Date: 2025-10-28 21:49+0000\n"
6-
"PO-Revision-Date: 2025-10-08 05:55+0000\n"
6+
"PO-Revision-Date: 2025-10-30 06:55+0000\n"
77
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
88
"Language-Team: Hebrew <https://l10n.elementaryos.org/projects/desktop/gala/"
99
"he/>\n"
@@ -101,7 +101,7 @@ msgstr ""
101101

102102
#: data/gala.metainfo.xml.in:24
103103
msgid "elementary, Inc."
104-
msgstr "elementary בע״מ"
104+
msgstr "elementary בע״מ."
105105

106106
#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:65
107107
#: data/gala.metainfo.xml.in:77 data/gala.metainfo.xml.in:92
@@ -127,27 +127,23 @@ msgstr "התרגומים עודכנו"
127127

128128
#: data/gala.metainfo.xml.in:35
129129
msgid "Improved HiDPI support"
130-
msgstr ""
130+
msgstr "תמיכה משופרת ב־HiDPI"
131131

132132
#: data/gala.metainfo.xml.in:36
133-
#, fuzzy
134-
#| msgid "Improved shadows performance"
135133
msgid "Improved render performance"
136-
msgstr "ביצועי הצלליות השתפרו"
134+
msgstr "ביצועי התיצוג השתפרו"
137135

138136
#: data/gala.metainfo.xml.in:37
139137
msgid "Reveal dock and panel in sync when starting"
140-
msgstr ""
138+
msgstr "המעגן והלוח נחשפים בצורה מתואמת עם ההפעלה"
141139

142140
#: data/gala.metainfo.xml.in:38
143-
#, fuzzy
144-
#| msgid "Duration of the workspace switch animation"
145141
msgid "Improved workspace switch dock animation"
146-
msgstr "משך הנפשת החלפת סביבת עבודה"
142+
msgstr "ההנפשה במעגן להחלפת סביבת עבודה השתפרה"
147143

148144
#: data/gala.metainfo.xml.in:39
149145
msgid "Picture-in-Picture windows now have rounded corners"
150-
msgstr ""
146+
msgstr "לחלונות תמונה בתוך תמונה יש כעת פינות מעוגלות"
151147

152148
#: data/gala.metainfo.xml.in:147
153149
msgid "Window state is now saved on sleep and shutdown"

po/hu.po

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: noise\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-10-28 21:49+0000\n"
11-
"PO-Revision-Date: 2025-06-26 09:55+0000\n"
11+
"PO-Revision-Date: 2025-10-30 06:55+0000\n"
1212
"Last-Translator: TomiOhl <[email protected]>\n"
1313
"Language-Team: Hungarian <https://l10n.elementaryos.org/projects/desktop/"
1414
"gala/hu/>\n"
@@ -134,27 +134,23 @@ msgstr "Frissített fordítások"
134134

135135
#: data/gala.metainfo.xml.in:35
136136
msgid "Improved HiDPI support"
137-
msgstr ""
137+
msgstr "Javított HiDPI-támogatás"
138138

139139
#: data/gala.metainfo.xml.in:36
140-
#, fuzzy
141-
#| msgid "Improved shadows performance"
142140
msgid "Improved render performance"
143-
msgstr "Árnyékok teljesítménye javítva"
141+
msgstr "Leképezési teljesítmény javítva"
144142

145143
#: data/gala.metainfo.xml.in:37
146144
msgid "Reveal dock and panel in sync when starting"
147-
msgstr ""
145+
msgstr "A dokk és a panel szinkronban jelenik meg indulás után"
148146

149147
#: data/gala.metainfo.xml.in:38
150-
#, fuzzy
151-
#| msgid "Duration of the workspace switch animation"
152148
msgid "Improved workspace switch dock animation"
153-
msgstr "A munkaterület-váltó animáció időtartama"
149+
msgstr "Szebben animált dokk munkaterület-váltáskor"
154150

155151
#: data/gala.metainfo.xml.in:39
156152
msgid "Picture-in-Picture windows now have rounded corners"
157-
msgstr ""
153+
msgstr "A kép a képben ablakok lekerekített sarkakat kaptak"
158154

159155
#: data/gala.metainfo.xml.in:147
160156
msgid "Window state is now saved on sleep and shutdown"

po/ru.po

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgstr ""
88
"Project-Id-Version: beat-box\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2025-10-28 21:49+0000\n"
11-
"PO-Revision-Date: 2025-06-06 11:55+0000\n"
12-
"Last-Translator: lenemter <[email protected]>\n"
11+
"PO-Revision-Date: 2025-11-03 08:55+0000\n"
12+
"Last-Translator: Leo <[email protected]>\n"
1313
"Language-Team: Russian <https://l10n.elementaryos.org/projects/desktop/gala/"
1414
"ru/>\n"
1515
"Language: ru\n"
@@ -133,27 +133,23 @@ msgstr "Обновлены переводы"
133133

134134
#: data/gala.metainfo.xml.in:35
135135
msgid "Improved HiDPI support"
136-
msgstr ""
136+
msgstr "Улучшена поддержка HiDPI"
137137

138138
#: data/gala.metainfo.xml.in:36
139-
#, fuzzy
140-
#| msgid "Improved shadows performance"
141139
msgid "Improved render performance"
142-
msgstr "Улучшена производительность теней"
140+
msgstr "Улучшена производительность отрисовки"
143141

144142
#: data/gala.metainfo.xml.in:37
145143
msgid "Reveal dock and panel in sync when starting"
146-
msgstr ""
144+
msgstr "Появление дока и панели при запуске теперь синхронизированы"
147145

148146
#: data/gala.metainfo.xml.in:38
149-
#, fuzzy
150-
#| msgid "Duration of the workspace switch animation"
151147
msgid "Improved workspace switch dock animation"
152-
msgstr "Длительность анимации смены рабочего стола"
148+
msgstr "Улучшена анимация дока при смене рабочего стола"
153149

154150
#: data/gala.metainfo.xml.in:39
155151
msgid "Picture-in-Picture windows now have rounded corners"
156-
msgstr ""
152+
msgstr "Окна режима «Картинка-в-картинке» теперь имеют закруглённые углы"
157153

158154
#: data/gala.metainfo.xml.in:147
159155
msgid "Window state is now saved on sleep and shutdown"

0 commit comments

Comments
 (0)