Skip to content

Commit 497050c

Browse files
authored
Merge branch 'main' into lenemter/windowswicher-scale-icons
2 parents 060b694 + d23fdb8 commit 497050c

File tree

6 files changed

+79
-82
lines changed

6 files changed

+79
-82
lines changed

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
}

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/sv.po

Lines changed: 22 additions & 25 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-10-23 12:55+0000\n"
11+
"PO-Revision-Date: 2025-10-30 06:55+0000\n"
1212
"Last-Translator: Daniel Nylander <[email protected]>\n"
1313
"Language-Team: Swedish <https://l10n.elementaryos.org/projects/desktop/gala/"
1414
"sv/>\n"
@@ -59,7 +59,7 @@ msgstr "Alltid överst"
5959

6060
#: daemon-gtk3/WindowMenu.vala:73 daemon/WindowMenu.vala:84
6161
msgid "Always on Visible Workspace"
62-
msgstr "Alltid på aktiv arbetsyta"
62+
msgstr "Alltid på synlig arbetsyta"
6363

6464
#: daemon-gtk3/WindowMenu.vala:81 daemon/WindowMenu.vala:94
6565
msgid "Move to Workspace Left"
@@ -95,7 +95,7 @@ msgstr "Multitasking och fönsterhantering"
9595

9696
#: data/gala.metainfo.xml.in:12
9797
msgid "A window &amp; compositing manager for Pantheon"
98-
msgstr "Ett fönster och en compositing-hanterare för Pantheon"
98+
msgstr "Ett fönster- och compositing-hanterare för Pantheon"
9999

100100
#: data/gala.metainfo.xml.in:14
101101
msgid ""
@@ -133,31 +133,27 @@ msgstr "Uppdaterade översättningar"
133133

134134
#: data/gala.metainfo.xml.in:35
135135
msgid "Improved HiDPI support"
136-
msgstr ""
136+
msgstr "Förbättrat HiDPI-stöd"
137137

138138
#: data/gala.metainfo.xml.in:36
139-
#, fuzzy
140-
#| msgid "Improved shadows performance"
141139
msgid "Improved render performance"
142-
msgstr "Förbättrad prestanda för skuggor"
140+
msgstr "Förbättrad renderingsprestanda"
143141

144142
#: data/gala.metainfo.xml.in:37
145143
msgid "Reveal dock and panel in sync when starting"
146-
msgstr ""
144+
msgstr "Visa docka och panel synkront vid start"
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 "Varaktighet för animation vid byte av arbetsyta"
148+
msgstr "Förbättrad dockanimering vid byte av arbetsyta"
153149

154150
#: data/gala.metainfo.xml.in:39
155151
msgid "Picture-in-Picture windows now have rounded corners"
156-
msgstr ""
152+
msgstr "Bild-i-bild-fönster har nu rundade hörn"
157153

158154
#: data/gala.metainfo.xml.in:147
159155
msgid "Window state is now saved on sleep and shutdown"
160-
msgstr "Fönsterstatus sparas nu vid viloläge och avstängning"
156+
msgstr "Fönstertillstånd sparas nu vid viloläge och avstängning"
161157

162158
#: data/gala.metainfo.xml.in:148
163159
msgid "Remove scaling effect from menus"
@@ -177,23 +173,24 @@ msgstr "Lagt till genväg för interaktiv skärmdump"
177173

178174
#: data/gala.metainfo.xml.in:182
179175
msgid "Fixed crash when using tiling shortcuts"
180-
msgstr "Fixad krasch vid användning av kortkommandon för tiling"
176+
msgstr "Fixade krasch vid användning av kortkommandon för tiling"
181177

182178
#: data/gala.metainfo.xml.in:211
183179
msgid "Improved shadows performance"
184180
msgstr "Förbättrad prestanda för skuggor"
185181

186182
#: data/gala.metainfo.xml.in:255
187183
msgid "Fix a potential crash when moving windows between workspaces"
188-
msgstr "Åtgärdat en potentiell krasch när du flyttar fönster mellan arbetsytor"
184+
msgstr ""
185+
"Åtgärdat en potentiell krasch vid förflyttning av fönster mellan arbetsytor"
189186

190187
#: data/gala.metainfo.xml.in:256
191188
msgid "Fix notification animation when entering multitasking view"
192-
msgstr "Fixa animering av meddelanden när du går in i multitasking-vyn"
189+
msgstr "Fixa animering av meddelanden när man går in i multitasking-vyn"
193190

194191
#: data/gala.metainfo.xml.in:271
195192
msgid "Improve keyboard navigation in Multitasking View"
196-
msgstr "Förbättrad tangentbordsnavigering i Multitaskingvyn"
193+
msgstr "Förbättrad tangentbordsnavigering i multitaskingvyn"
197194

198195
#: data/gala.metainfo.xml.in:272
199196
msgid "Change panel color at the same time as wallpaper transition"
@@ -204,8 +201,8 @@ msgid ""
204201
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
205202
"option"
206203
msgstr ""
207-
"Byte av bakgrundsbild eller insomning respekterar alternativet \"Reduce "
208-
"Motion\""
204+
"Byte av bakgrundsbild eller insomning respekterar alternativet "
205+
"\"Minska rörelse\""
209206

210207
#: data/gala.metainfo.xml.in:313
211208
msgid "Use appropriate drag-and-drop pointers when moving windows"
@@ -221,7 +218,7 @@ msgstr "Förbättra dynamiska arbetsytors beteende med flera skärmar"
221218

222219
#: data/gala.metainfo.xml.in:337
223220
msgid "Improve handling of move-to-workspace shortcut"
224-
msgstr "Förbättra hanteringen av genvägen \"flytta till arbetsyta"
221+
msgstr "Förbättra hanteringen av genvägen move-to-workspace"
225222

226223
#: data/gala-multitaskingview.desktop.in:4
227224
#: data/gala-multitaskingview.desktop.in:6
@@ -264,7 +261,7 @@ msgstr ""
264261

265262
#: src/Dialogs/CloseDialog.vala:29
266263
msgid "Force Quit"
267-
msgstr "Tvinga fram avslutning"
264+
msgstr "Tvinga avslutning"
268265

269266
#: src/Dialogs/CloseDialog.vala:30
270267
msgid "Wait"
@@ -273,7 +270,7 @@ msgstr "Vänta"
273270
#: src/Dialogs/InhibitShortcutsDialog.vala:23
274271
#, c-format
275272
msgid "“%s” wants to inhibit system shortcuts"
276-
msgstr "\"%s\" vill hindra genvägar i systemet"
273+
msgstr "\"%s\" vill hindra systemgenvägar"
277274

278275
#: src/Dialogs/InhibitShortcutsDialog.vala:25
279276
msgid "An application wants to inhibit system shortcuts"
@@ -317,11 +314,11 @@ msgstr "Skärmdump sparas till urklipp"
317314

318315
#: src/ScreenshotManager.vala:176
319316
msgid "Screenshot saved to screenshots folder"
320-
msgstr "Skärmdump sparas i mappen Skärmdumpar"
317+
msgstr "Skärmdump sparas i skärmdumpsmappen"
321318

322319
#: src/ScreenshotManager.vala:470
323320
msgid "Screenshots"
324-
msgstr "Skärmbilder"
321+
msgstr "Skärmdumpar"
325322

326323
#: src/Widgets/WindowSwitcher/WindowSwitcher.vala:80
327324
msgid "Window switcher"
@@ -336,7 +333,7 @@ msgstr[1] "Ändringar återställs automatiskt efter %i sekunder."
336333

337334
#: src/WindowManager.vala:1726
338335
msgid "Keep new display settings?"
339-
msgstr "Behålla nya skärminställningar?"
336+
msgstr "Behåll nya skärminställningar?"
340337

341338
#: src/WindowManager.vala:1730
342339
msgid "Keep Settings"

0 commit comments

Comments
 (0)