Skip to content

Commit

Permalink
Merge branch 'master' into release-7.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
lenemter authored Oct 28, 2023
2 parents 62a391f + b8bea1f commit b341407
Show file tree
Hide file tree
Showing 214 changed files with 6,567 additions and 4,480 deletions.
1 change: 1 addition & 0 deletions data/gala.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@
<enum id="GestureSwipeHorizontal">
<value nick="none" value="0" />
<value nick="switch-to-workspace" value="1" />
<value nick="move-to-workspace" value="2" />
</enum>
<enum id="GestureSwipeUp">
<value nick="none" value="0" />
Expand Down
11 changes: 9 additions & 2 deletions data/gala.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,23 @@
<update_contact>contact_at_elementary.io</update_contact>

<releases>
<release version="7.1.3" date="2023-10-25" urgency="medium">
<release version="7.1.3" date="2023-10-28" urgency="medium">
<description>
<p>Improvements:</p>
<ul>
<li>Changing the wallpaper or going to sleep respects the "Reduce Motion" option</li>
<li>Use appropriate drag-and-drop pointers when moving windows</li>
<li>Updated translations</li>
</ul>
</description>
<issues>
<issue url="https://github.com/elementary/gala/issues/1774">Scheduled switch to dark style does not dim the wallpaper after cold reboot on elementary OS 7.1</issue>
<issue url="https://github.com/elementary/gala/issues/506">After login there is always 2 unpopulated workspaces open.</issue>
<issue url="https://github.com/elementary/gala/issues/695">Wrong workspaces behavior</issue>
<issue url="https://github.com/elementary/gala/issues/1109">Use gestures for "move to workspace"</issue>
<issue url="https://github.com/elementary/gala/issues/1261">Alt + Shift unnecessarily blocked when there is only one keyboard layout</issue>
<issue url="https://github.com/elementary/gala/discussions/1764">Counter Strike 2 causes segfault in libmutter on exit</issue>
<issue url="https://github.com/elementary/gala/issues/1774">Scheduled switch to dark style does not dim the wallpaper after cold reboot on elementary OS 7.1</issue>
<issue url="https://github.com/elementary/gala/issues/1783">Notifications appear in the middle of the screen</issue>
</issues>
</release>

Expand Down
10 changes: 8 additions & 2 deletions plugins/pip/PopupWindow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
private int button_size;
private int container_margin;
private const int SHADOW_SIZE = 100;
private const uint FADE_OUT_TIMEOUT = 200;
private const float MINIMUM_SCALE = 0.1f;
private const float MAXIMUM_SCALE = 1.0f;
Expand Down Expand Up @@ -88,7 +87,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
container = new Clutter.Actor ();
container.reactive = true;
container.set_scale (0.35f, 0.35f);
container.add_effect (new ShadowEffect (SHADOW_SIZE) { css_class = "window-clone" });
container.add_effect (new ShadowEffect (55) { css_class = "window-clone" });
container.add_child (clone);
container.add_action (move_action);

Expand Down Expand Up @@ -218,12 +217,15 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
}

private Clutter.Actor on_move_begin () {
wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);

return this;
}

private void on_move_end () {
reactive = true;
update_screen_position ();
wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
}

#if HAS_MUTTER45
Expand All @@ -245,6 +247,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
grab = resize_button.get_stage ().grab (resize_button);
resize_button.event.connect (on_resize_event);

wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);

return Clutter.EVENT_PROPAGATE;
}

Expand Down Expand Up @@ -303,6 +307,8 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
resizing = false;

update_screen_position ();

wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
}

private void on_allocation_changed () {
Expand Down
54 changes: 32 additions & 22 deletions po/aa.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gala 3.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
"POT-Creation-Date: 2023-09-29 22:16+0000\n"
"POT-Creation-Date: 2023-10-27 00:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -47,27 +47,27 @@ msgstr ""
msgid "Screenshot taken"
msgstr ""

#: src/WindowManager.vala:2211
#: src/WindowManager.vala:2242
#, c-format
msgid "Changes will automatically revert after %i second."
msgid_plural "Changes will automatically revert after %i seconds."
msgstr[0] ""
msgstr[1] ""

#: src/WindowManager.vala:2218
#: src/WindowManager.vala:2249
msgid "Keep new display settings?"
msgstr ""

#: src/WindowManager.vala:2222
#: src/WindowManager.vala:2253
msgid "Keep Settings"
msgstr ""

#: src/WindowManager.vala:2223
#: src/WindowManager.vala:2254
msgid "Use Previous Settings"
msgstr ""

#. / TRANSLATORS: %s represents a timestamp here
#: src/WindowManager.vala:2265
#: src/WindowManager.vala:2296
#, c-format
msgid "Screenshot from %s"
msgstr ""
Expand Down Expand Up @@ -150,59 +150,69 @@ msgstr ""
msgid "elementary, Inc."
msgstr ""

#: data/gala.metainfo.xml.in:30 data/gala.metainfo.xml.in:42
#: data/gala.metainfo.xml.in:58 data/gala.metainfo.xml.in:73
#: data/gala.metainfo.xml.in:85 data/gala.metainfo.xml.in:110
#: data/gala.metainfo.xml.in:30 data/gala.metainfo.xml.in:50
#: data/gala.metainfo.xml.in:66 data/gala.metainfo.xml.in:81
#: data/gala.metainfo.xml.in:93 data/gala.metainfo.xml.in:118
msgid "Improvements:"
msgstr ""

#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:45
#: data/gala.metainfo.xml.in:60 data/gala.metainfo.xml.in:75
#: data/gala.metainfo.xml.in:93 data/gala.metainfo.xml.in:115
#: data/gala.metainfo.xml.in:32
msgid ""
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
"option"
msgstr ""

#: data/gala.metainfo.xml.in:33
msgid "Use appropriate drag-and-drop pointers when moving windows"
msgstr ""

#: data/gala.metainfo.xml.in:34 data/gala.metainfo.xml.in:53
#: data/gala.metainfo.xml.in:68 data/gala.metainfo.xml.in:83
#: data/gala.metainfo.xml.in:101 data/gala.metainfo.xml.in:123
msgid "Updated translations"
msgstr ""

#: data/gala.metainfo.xml.in:44
#: data/gala.metainfo.xml.in:52
msgid "Improve handling of move-to-workspace shortcut"
msgstr ""

#: data/gala.metainfo.xml.in:87
#: data/gala.metainfo.xml.in:95
msgid ""
"Set the keyboard layout correctly at startup so that the indicator matches "
"the selected layout"
msgstr ""

#: data/gala.metainfo.xml.in:88
#: data/gala.metainfo.xml.in:96
msgid "Fix screenshot keyboard shortcuts while in Multitasking View"
msgstr ""

#: data/gala.metainfo.xml.in:89
#: data/gala.metainfo.xml.in:97
msgid ""
"Correctly set the active workspace highlight when entering Multitasking View "
"and animate 1:1 with multitouch gestures"
msgstr ""

#: data/gala.metainfo.xml.in:90
#: data/gala.metainfo.xml.in:98
msgid "Update panel color after dimming the wallpaper"
msgstr ""

#: data/gala.metainfo.xml.in:91
#: data/gala.metainfo.xml.in:99
msgid "Scale rounded corners per-display"
msgstr ""

#: data/gala.metainfo.xml.in:92
#: data/gala.metainfo.xml.in:100
msgid "Support fractional scaling"
msgstr ""

#: data/gala.metainfo.xml.in:112
#: data/gala.metainfo.xml.in:120
msgid "Performance improvements"
msgstr ""

#: data/gala.metainfo.xml.in:113
#: data/gala.metainfo.xml.in:121
msgid "Remove texture from Multitasking View"
msgstr ""

#: data/gala.metainfo.xml.in:114
#: data/gala.metainfo.xml.in:122
msgid "Avoid accidentally selecting windows in the window switcher"
msgstr ""

Expand Down
54 changes: 32 additions & 22 deletions po/ab.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gala 3.2.0\n"
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
"POT-Creation-Date: 2023-09-29 22:16+0000\n"
"POT-Creation-Date: 2023-10-27 00:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Expand Down Expand Up @@ -47,27 +47,27 @@ msgstr ""
msgid "Screenshot taken"
msgstr ""

#: src/WindowManager.vala:2211
#: src/WindowManager.vala:2242
#, c-format
msgid "Changes will automatically revert after %i second."
msgid_plural "Changes will automatically revert after %i seconds."
msgstr[0] ""
msgstr[1] ""

#: src/WindowManager.vala:2218
#: src/WindowManager.vala:2249
msgid "Keep new display settings?"
msgstr ""

#: src/WindowManager.vala:2222
#: src/WindowManager.vala:2253
msgid "Keep Settings"
msgstr ""

#: src/WindowManager.vala:2223
#: src/WindowManager.vala:2254
msgid "Use Previous Settings"
msgstr ""

#. / TRANSLATORS: %s represents a timestamp here
#: src/WindowManager.vala:2265
#: src/WindowManager.vala:2296
#, c-format
msgid "Screenshot from %s"
msgstr ""
Expand Down Expand Up @@ -150,59 +150,69 @@ msgstr ""
msgid "elementary, Inc."
msgstr ""

#: data/gala.metainfo.xml.in:30 data/gala.metainfo.xml.in:42
#: data/gala.metainfo.xml.in:58 data/gala.metainfo.xml.in:73
#: data/gala.metainfo.xml.in:85 data/gala.metainfo.xml.in:110
#: data/gala.metainfo.xml.in:30 data/gala.metainfo.xml.in:50
#: data/gala.metainfo.xml.in:66 data/gala.metainfo.xml.in:81
#: data/gala.metainfo.xml.in:93 data/gala.metainfo.xml.in:118
msgid "Improvements:"
msgstr ""

#: data/gala.metainfo.xml.in:32 data/gala.metainfo.xml.in:45
#: data/gala.metainfo.xml.in:60 data/gala.metainfo.xml.in:75
#: data/gala.metainfo.xml.in:93 data/gala.metainfo.xml.in:115
#: data/gala.metainfo.xml.in:32
msgid ""
"Changing the wallpaper or going to sleep respects the \"Reduce Motion\" "
"option"
msgstr ""

#: data/gala.metainfo.xml.in:33
msgid "Use appropriate drag-and-drop pointers when moving windows"
msgstr ""

#: data/gala.metainfo.xml.in:34 data/gala.metainfo.xml.in:53
#: data/gala.metainfo.xml.in:68 data/gala.metainfo.xml.in:83
#: data/gala.metainfo.xml.in:101 data/gala.metainfo.xml.in:123
msgid "Updated translations"
msgstr ""

#: data/gala.metainfo.xml.in:44
#: data/gala.metainfo.xml.in:52
msgid "Improve handling of move-to-workspace shortcut"
msgstr ""

#: data/gala.metainfo.xml.in:87
#: data/gala.metainfo.xml.in:95
msgid ""
"Set the keyboard layout correctly at startup so that the indicator matches "
"the selected layout"
msgstr ""

#: data/gala.metainfo.xml.in:88
#: data/gala.metainfo.xml.in:96
msgid "Fix screenshot keyboard shortcuts while in Multitasking View"
msgstr ""

#: data/gala.metainfo.xml.in:89
#: data/gala.metainfo.xml.in:97
msgid ""
"Correctly set the active workspace highlight when entering Multitasking View "
"and animate 1:1 with multitouch gestures"
msgstr ""

#: data/gala.metainfo.xml.in:90
#: data/gala.metainfo.xml.in:98
msgid "Update panel color after dimming the wallpaper"
msgstr ""

#: data/gala.metainfo.xml.in:91
#: data/gala.metainfo.xml.in:99
msgid "Scale rounded corners per-display"
msgstr ""

#: data/gala.metainfo.xml.in:92
#: data/gala.metainfo.xml.in:100
msgid "Support fractional scaling"
msgstr ""

#: data/gala.metainfo.xml.in:112
#: data/gala.metainfo.xml.in:120
msgid "Performance improvements"
msgstr ""

#: data/gala.metainfo.xml.in:113
#: data/gala.metainfo.xml.in:121
msgid "Remove texture from Multitasking View"
msgstr ""

#: data/gala.metainfo.xml.in:114
#: data/gala.metainfo.xml.in:122
msgid "Avoid accidentally selecting windows in the window switcher"
msgstr ""

Expand Down
Loading

0 comments on commit b341407

Please sign in to comment.