Skip to content

Commit 8b04e7d

Browse files
authored
Merge branch 'main' into leolost/fix-cancel-workspace-animation-gesture
2 parents 294a3b8 + 74f91ae commit 8b04e7d

File tree

8 files changed

+101
-139
lines changed

8 files changed

+101
-139
lines changed

po/hu.po

Lines changed: 3 additions & 5 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: 2024-11-23 16:06+0000\n"
11-
"PO-Revision-Date: 2024-10-03 23:16+0000\n"
11+
"PO-Revision-Date: 2024-12-08 11:16+0000\n"
1212
"Last-Translator: TomiOhl <[email protected]>\n"
1313
"Language-Team: Hungarian <https://l10n.elementary.io/projects/desktop/gala/"
1414
"hu/>\n"
@@ -17,7 +17,7 @@ msgstr ""
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 5.6.2\n"
20+
"X-Generator: Weblate 5.8.4\n"
2121
"X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -125,10 +125,8 @@ msgid "Updated translations"
125125
msgstr "Frissített fordítások"
126126

127127
#: data/gala.metainfo.xml.in:35
128-
#, fuzzy
129-
#| msgid "Improve window shadows for legacy apps"
130128
msgid "Improved shadows performance"
131-
msgstr "Az elavult alkalmazások ablakának árnyéka javítva"
129+
msgstr "Árnyékok teljesítménye javítva"
132130

133131
#: data/gala.metainfo.xml.in:78
134132
msgid "Fix a potential crash when moving windows between workspaces"

po/lv.po

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ msgstr ""
88
"Project-Id-Version: noise\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-11-23 16:06+0000\n"
11-
"PO-Revision-Date: 2014-06-28 01:54+0000\n"
12-
"Last-Translator: Matiss Treinis <[email protected]>\n"
13-
"Language-Team: Latvian <[email protected]>\n"
11+
"PO-Revision-Date: 2024-12-08 11:16+0000\n"
12+
"Last-Translator: Jānis Greiškāns <[email protected]>\n"
13+
"Language-Team: Latvian <https://l10n.elementary.io/projects/desktop/gala/lv/>"
14+
"\n"
1415
"Language: lv\n"
1516
"MIME-Version: 1.0\n"
1617
"Content-Type: text/plain; charset=UTF-8\n"
1718
"Content-Transfer-Encoding: 8bit\n"
19+
"Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= "
20+
"19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
21+
"X-Generator: Weblate 5.8.4\n"
1822
"X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
19-
"X-Generator: Launchpad (build 18326)\n"
2023

2124
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
2225
msgid "Change Wallpaper…"
@@ -251,15 +254,15 @@ msgstr[1] ""
251254

252255
#: src/WindowManager.vala:2362
253256
msgid "Keep new display settings?"
254-
msgstr ""
257+
msgstr "Paturēt displeja izmaiņas?"
255258

256259
#: src/WindowManager.vala:2366
257260
msgid "Keep Settings"
258-
msgstr ""
261+
msgstr "Paturēt Iestatījumus"
259262

260263
#: src/WindowManager.vala:2367
261264
msgid "Use Previous Settings"
262-
msgstr ""
265+
msgstr "Lietot Iepriekšējos Iestatījumus"
263266

264267
#. / TRANSLATORS: %s represents a timestamp here
265268
#: src/WindowManager.vala:2406

po/zh_TW.po

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-11-23 16:06+0000\n"
11-
"PO-Revision-Date: 2024-11-06 11:20+0000\n"
11+
"PO-Revision-Date: 2024-12-09 11:10+0000\n"
1212
"Last-Translator: Kisaragi Hiu <[email protected]>\n"
13-
"Language-Team: Chinese (Traditional) <https://l10n.elementary.io/projects/"
14-
"desktop/gala/zh_Hant/>\n"
13+
"Language-Team: Chinese (Traditional Han script) <https://l10n.elementary.io/"
14+
"projects/desktop/gala/zh_Hant/>\n"
1515
"Language: zh_TW\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=1; plural=0;\n"
20-
"X-Generator: Weblate 5.6.2\n"
20+
"X-Generator: Weblate 5.8.4\n"
2121
"X-Launchpad-Export-Date: 2017-02-21 05:48+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -34,7 +34,7 @@ msgstr "系統設定值…"
3434

3535
#: daemon/DBus.vala:207 daemon-gtk3/BackgroundMenu.vala:47
3636
msgid "Failed to open System Settings"
37-
msgstr "開啟系統設定失敗了"
37+
msgstr "無法開啟《系統設定值》"
3838

3939
#: daemon/DBus.vala:208 daemon-gtk3/BackgroundMenu.vala:48
4040
msgid "A handler for the “settings://” URI scheme must be installed."
@@ -123,7 +123,7 @@ msgstr "更新翻譯"
123123

124124
#: data/gala.metainfo.xml.in:35
125125
msgid "Improved shadows performance"
126-
msgstr ""
126+
msgstr "改善陰影效能"
127127

128128
#: data/gala.metainfo.xml.in:78
129129
msgid "Fix a potential crash when moving windows between workspaces"

src/InternalUtils.vala

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,5 +340,13 @@ namespace Gala {
340340
return { 0, 0, (int) screen_width, (int) screen_height };
341341
}
342342
}
343+
344+
public static Clutter.ActorBox actor_box_from_rect (float x, float y, float width, float height) {
345+
var actor_box = Clutter.ActorBox ();
346+
actor_box.init_rect (x, y, width, height);
347+
Clutter.ActorBox.clamp_to_pixel (ref actor_box);
348+
349+
return actor_box;
350+
}
343351
}
344352
}

src/ShellClients/HideTracker.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public class Gala.HideTracker : Object {
171171
continue;
172172
}
173173

174-
if (!panel.window.get_frame_rect ().overlap (window.get_frame_rect ())) {
174+
if (!panel.get_custom_window_rect ().overlap (window.get_frame_rect ())) {
175175
continue;
176176
}
177177

src/Widgets/Tooltip.vala

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,7 @@ public class Gala.Tooltip : CanvasActor {
1313
*/
1414
private Clutter.Text text_actor;
1515

16-
/**
17-
* Maximum width of the Tooltip.
18-
* @see set_max_width
19-
*/
20-
public float max_width;
21-
2216
construct {
23-
max_width = 200;
24-
2517
#if HAS_MUTTER47
2618
Cogl.Color text_color = {
2719
#else
@@ -51,21 +43,6 @@ public class Gala.Tooltip : CanvasActor {
5143
text_actor.text = new_text;
5244
}
5345

54-
public void set_max_width (float new_max_width) {
55-
max_width = new_max_width;
56-
57-
queue_relayout ();
58-
}
59-
60-
protected override void allocate (Clutter.ActorBox box) {
61-
if (box.get_width () > max_width) {
62-
box.set_origin (box.get_x () + ((box.get_width () - max_width) / 2), box.get_y ());
63-
box.set_size (max_width, box.get_height ());
64-
}
65-
66-
base.allocate (box);
67-
}
68-
6946
protected override void draw (Cairo.Context ctx, int width, int height) {
7047
ctx.save ();
7148
ctx.set_operator (Cairo.Operator.CLEAR);

0 commit comments

Comments
 (0)