Skip to content

Fix crash when using tiling shortcuts #2040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 11, 2024
Merged

Fix crash when using tiling shortcuts #2040

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
989e898
Fix crash when using tiling shortcuts
lenemter Aug 21, 2024
62b9359
Merge branch 'main' into lenemter/fix-crash-on-tile
danirabbit Aug 21, 2024
e8a5f0b
Merge branch 'main' into lenemter/fix-crash-on-tile
zeebok Sep 4, 2024
74fe449
Merge branch 'main' into lenemter/fix-crash-on-tile
zeebok Oct 5, 2024
2fc33d4
Merge branch 'main' into lenemter/fix-crash-on-tile
lenemter Dec 7, 2024
135d64d
Merge branch 'main' into lenemter/fix-crash-on-tile
lenemter Dec 7, 2024
20516dc
Merge branch 'main' into lenemter/fix-crash-on-tile
leolost2605 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ namespace Gala {
#else
private Meta.Rectangle old_rect_size_change;
#endif
private Clutter.Actor latest_window_snapshot;
private Clutter.Actor? latest_window_snapshot;

private GLib.Settings behavior_settings;
private GLib.Settings new_behavior_settings;
Expand Down Expand Up @@ -1402,13 +1402,13 @@ namespace Gala {
latest_window_snapshot.restore_easing_state ();

ulong maximize_old_handler_id = 0UL;
maximize_old_handler_id = latest_window_snapshot.transitions_completed.connect (() => {
latest_window_snapshot.disconnect (maximize_old_handler_id);
latest_window_snapshot.destroy ();
maximize_old_handler_id = latest_window_snapshot.transitions_completed.connect ((snapshot) => {
snapshot.disconnect (maximize_old_handler_id);
snapshot.destroy ();
actor.set_translation (0.0f, 0.0f, 0.0f);
});

latest_window_snapshot.restore_easing_state ();
latest_window_snapshot = null;

actor.set_pivot_point (0.0f, 0.0f);
actor.set_translation (old_rect_size_change.x - ex, old_rect_size_change.y - ey, 0.0f);
Expand Down Expand Up @@ -1775,11 +1775,13 @@ namespace Gala {
latest_window_snapshot.restore_easing_state ();

ulong unmaximize_old_handler_id = 0UL;
unmaximize_old_handler_id = latest_window_snapshot.transitions_completed.connect (() => {
latest_window_snapshot.disconnect (unmaximize_old_handler_id);
latest_window_snapshot.destroy ();
unmaximize_old_handler_id = latest_window_snapshot.transitions_completed.connect ((snapshot) => {
snapshot.disconnect (unmaximize_old_handler_id);
snapshot.destroy ();
});

latest_window_snapshot = null;

actor.set_pivot_point (0.0f, 0.0f);
actor.set_position (ex, ey);
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);
Expand Down
Loading