Skip to content

Commit f0b085a

Browse files
authored
Merge branch 'main' into lenemter/fix-clip
2 parents 5ddf33a + 5f846b9 commit f0b085a

File tree

6 files changed

+21
-37
lines changed

6 files changed

+21
-37
lines changed

po/ca.po

Lines changed: 5 additions & 6 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-06-03 19:09+0000\n"
11-
"PO-Revision-Date: 2025-04-19 13:20+0000\n"
11+
"PO-Revision-Date: 2025-06-05 07: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"
@@ -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.10.4\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121
"X-Launchpad-Export-Date: 2017-04-05 07:08+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -287,16 +287,15 @@ msgstr "Captura de %s"
287287

288288
#. / TRANSLATORS: %s represents a name of file manager
289289
#: src/ScreenshotManager.vala:170
290-
#, fuzzy, c-format
291-
#| msgid "Show in Files"
290+
#, c-format
292291
msgid "Show in %s"
293-
msgstr "Mostra-ho a Fitxers"
292+
msgstr "Mostra-ho a %s"
294293

295294
#. / TRANSLATORS: %s represents a name of image viewer
296295
#: src/ScreenshotManager.vala:176
297296
#, c-format
298297
msgid "Open in %s"
299-
msgstr ""
298+
msgstr "Obre-ho a %s"
300299

301300
#: src/ScreenshotManager.vala:184 src/ScreenshotManager.vala:543
302301
msgid "Screenshot taken"

po/fr.po

Lines changed: 5 additions & 6 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-06-03 19:09+0000\n"
11-
"PO-Revision-Date: 2025-04-23 10:55+0000\n"
11+
"PO-Revision-Date: 2025-06-05 07:55+0000\n"
1212
"Last-Translator: Nathan <[email protected]>\n"
1313
"Language-Team: French <https://l10n.elementaryos.org/projects/desktop/gala/"
1414
"fr/>\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.10.4\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121
"X-Launchpad-Export-Date: 2017-02-28 05:04+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -294,16 +294,15 @@ msgstr "Captures d'écran de %s"
294294

295295
#. / TRANSLATORS: %s represents a name of file manager
296296
#: src/ScreenshotManager.vala:170
297-
#, fuzzy, c-format
298-
#| msgid "Show in Files"
297+
#, c-format
299298
msgid "Show in %s"
300-
msgstr "Afficher dans Fichiers"
299+
msgstr "Afficher dans %s"
301300

302301
#. / TRANSLATORS: %s represents a name of image viewer
303302
#: src/ScreenshotManager.vala:176
304303
#, c-format
305304
msgid "Open in %s"
306-
msgstr ""
305+
msgstr "Ouvrir dans %s"
307306

308307
#: src/ScreenshotManager.vala:184 src/ScreenshotManager.vala:543
309308
msgid "Screenshot taken"

po/ja.po

Lines changed: 5 additions & 6 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-06-03 19:09+0000\n"
11-
"PO-Revision-Date: 2025-04-18 01:55+0000\n"
11+
"PO-Revision-Date: 2025-06-05 07:55+0000\n"
1212
"Last-Translator: Ryo Nakano <[email protected]>\n"
1313
"Language-Team: Japanese <https://l10n.elementaryos.org/projects/desktop/gala/"
1414
"ja/>\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=1; plural=0;\n"
20-
"X-Generator: Weblate 5.10.4\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121
"X-Launchpad-Export-Date: 2017-03-02 05:47+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -277,16 +277,15 @@ msgstr "スクリーンショット %s"
277277

278278
#. / TRANSLATORS: %s represents a name of file manager
279279
#: src/ScreenshotManager.vala:170
280-
#, fuzzy, c-format
281-
#| msgid "Show in Files"
280+
#, c-format
282281
msgid "Show in %s"
283-
msgstr "“ファイル”で表示"
282+
msgstr "“%s”で表示"
284283

285284
#. / TRANSLATORS: %s represents a name of image viewer
286285
#: src/ScreenshotManager.vala:176
287286
#, c-format
288287
msgid "Open in %s"
289-
msgstr ""
288+
msgstr "“%s”で開く"
290289

291290
#: src/ScreenshotManager.vala:184 src/ScreenshotManager.vala:543
292291
msgid "Screenshot taken"

src/WindowAttentionTracker.vala

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/WindowManager.vala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ namespace Gala {
177177
window_tracker = new WindowTracker ();
178178
WindowStateSaver.init (window_tracker);
179179
window_tracker.init (display);
180-
WindowAttentionTracker.init (display);
181180

182181
notification_stack = new NotificationStack (display);
183182

@@ -1538,8 +1537,13 @@ namespace Gala {
15381537

15391538
latest_window_snapshot = null;
15401539

1540+
var buffer_rect = window.get_buffer_rect ();
1541+
var frame_rect = window.get_frame_rect ();
1542+
var real_actor_offset_x = frame_rect.x - buffer_rect.x;
1543+
var real_actor_offset_y = frame_rect.y - buffer_rect.y;
1544+
15411545
actor.set_pivot_point (0.0f, 0.0f);
1542-
actor.set_position (ex, ey);
1546+
actor.set_position (ex - real_actor_offset_x, ey - real_actor_offset_y);
15431547
actor.set_translation (-ex + offset_x * (1.0f / scale_x - 1.0f) + old_rect_size_change.x, -ey + offset_y * (1.0f / scale_y - 1.0f) + old_rect_size_change.y, 0.0f);
15441548
actor.set_scale (1.0f / scale_x, 1.0f / scale_y);
15451549

src/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ gala_bin_sources = files(
1414
'ScreenshotManager.vala',
1515
'SessionManager.vala',
1616
'SuperScrollAction.vala',
17-
'WindowAttentionTracker.vala',
1817
'WindowListener.vala',
1918
'WindowManager.vala',
2019
'WindowStateSaver.vala',

0 commit comments

Comments
 (0)