From 846ad7306b327d25b8c22e592136b1a6627c97d8 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 10 Oct 2019 11:40:53 +0200 Subject: [PATCH] Allow moving to the current desktop, to show the desktop popup --- openbox/actions/desktop.c | 4 +--- openbox/screen.c | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c index c2f73c6b..ddb888e2 100644 --- a/openbox/actions/desktop.c +++ b/openbox/actions/desktop.c @@ -190,9 +190,7 @@ static gboolean run_func(ObActionsData *data, gpointer options) g_assert_not_reached(); } - if (d < screen_num_desktops && - (d != screen_desktop || - (data->client && data->client->desktop != screen_desktop))) { + if (d < screen_num_desktops) { gboolean go = TRUE; actions_client_move(data, TRUE); diff --git a/openbox/screen.c b/openbox/screen.c index cb690acc..2aa2c56d 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -586,6 +586,9 @@ void screen_set_desktop(guint num, gboolean dofocus) previous = screen_desktop; screen_desktop = num; + if (ob_state() == OB_STATE_RUNNING) + screen_show_desktop_popup(screen_desktop, FALSE); + if (previous == num) return; OBT_PROP_SET32(obt_root(ob_screen), NET_CURRENT_DESKTOP, CARDINAL, num); @@ -660,9 +663,6 @@ void screen_set_desktop(guint num, gboolean dofocus) ob_debug("Moving to desktop %d", num+1); - if (ob_state() == OB_STATE_RUNNING) - screen_show_desktop_popup(screen_desktop, FALSE); - /* ignore enter events caused by the move */ ignore_start = event_start_ignore_all_enters(); -- 2.39.2