Skip to content

x11: Do not unminimize windows with initial IconicState #826

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

Open
zzhiyi wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −23
Open

x11: Do not unminimize windows with initial IconicState #826

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
35 changes: 12 additions & 23 deletions src/x11/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,33 +1406,22 @@ handle_other_xevent (MetaX11Display *x11_display,
{
window = meta_window_x11_new (display, event->xmaprequest.window,
FALSE, META_COMP_EFFECT_CREATE);
/* The window might have initial iconic state, but this is a
* MapRequest, fall through to ensure it is unminimized in
* that case.
*/
}
else if (frame_was_receiver)
else
{
meta_warning ("Map requests on the frame window are unexpected\n");
break;
}
meta_verbose ("MapRequest on %s mapped = %d minimized = %d",
window->desc, window->mapped, window->minimized);

/* Double check that creating the MetaWindow succeeded */
if (window == NULL)
break;

meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n",
window->desc, window->mapped, window->minimized);

if (window->minimized)
{
meta_window_unminimize (window);
if (window->workspace != workspace_manager->active_workspace)
if (window->minimized && !frame_was_receiver)
{
meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n",
window->mapped, window->minimized);
meta_window_change_workspace (window,
workspace_manager->active_workspace);
meta_window_unminimize (window);
if (window->workspace != workspace_manager->active_workspace)
{
meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d",
window->mapped, window->minimized);
meta_window_change_workspace (window,
workspace_manager->active_workspace);
}
}
}
break;
Expand Down
Loading