Skip to content

WindowSwitcher: Fix crash #2361

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 1 commit into from
Apr 17, 2025
Merged

WindowSwitcher: Fix crash #2361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions src/Widgets/WindowSwitcher/WindowSwitcher.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget {
_current_icon = value;
if (_current_icon != null) {
_current_icon.selected = true;

// _current_icon.grab_key_focus () sometimes results in a crash
// https://github.com/elementary/gala/issues/2308
get_stage ().set_key_focus (_current_icon);
_current_icon.grab_key_focus ();
}

update_caption_text ();
Expand Down Expand Up @@ -334,15 +331,14 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget {
}

private bool collect_all_windows (Meta.Display display, Meta.Workspace? workspace) {
container.remove_all_children ();
select_icon (null);

var windows = display.get_tab_list (Meta.TabList.NORMAL, workspace);
if (windows == null) {
return false;
}

container.remove_all_children ();

unowned var current_window = display.get_tab_current (Meta.TabList.NORMAL, workspace);
foreach (unowned var window in windows) {
var icon = new WindowSwitcherIcon (window, ICON_SIZE, scaling_factor);
Expand All @@ -357,6 +353,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget {
}

private bool collect_current_windows (Meta.Display display, Meta.Workspace? workspace) {
container.remove_all_children ();
select_icon (null);

var windows = display.get_tab_list (Meta.TabList.NORMAL, workspace);
Expand All @@ -369,8 +366,6 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget {
return false;
}

container.remove_all_children ();

unowned var window_tracker = ((WindowManagerGala) wm).window_tracker;
var app = window_tracker.get_app_for_window (current_window);
foreach (unowned var window in windows) {
Expand Down
Loading