Commit 01725725 authored by Walter Lozano's avatar Walter Lozano

client/maynard: Avoid deactivating when activating a different surface

Currently when maynard activates either launcher or indicators_menu it
deactivates the previous surface. In order to be able to display the
previous displayed surface if it wasn't explicitly deactivated, avoid
deactivating it implicitly.

This allows now to be able to show the launcher menu when displaying
the indicators_menu as a popup.
Signed-off-by: Walter Lozano's avatarWalter Lozano <walter.lozano@collabora.com>
parent 6c127bd6
Pipeline #165274 passed with stages
in 1 minute and 48 seconds
......@@ -239,12 +239,11 @@ launcher_toggle (GtkWidget *widget,
{
if (desktop->launcher_visible)
{
all_deactivate (desktop);
launcher_deactivate (desktop);
}
else
{
indicators_menu_deactivate (desktop);
launcher_activate(desktop);
launcher_activate (desktop);
}
}
......@@ -317,11 +316,10 @@ indicators_menu_toggle (GtkWidget *widget,
{
if (desktop->indicators_menu_visible)
{
all_deactivate (desktop);
indicators_menu_deactivate (desktop);
}
else
{
launcher_deactivate (desktop);
indicators_menu_activate (desktop);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment