rozniak/xfce-winxp-tc
1
0
Fork 0
mirror of https://github.com/rozniak/xfce-winxp-tc.git synced 2026-05-01 11:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix*: (Take 2) Fixes #217, Taskbar button switching stops working when a Mono or WINE program is open

Browse Source
This commit is contained in:
Rory Fewell
2023-09-02 12:14:13 +01:00
parent b08f533f4b
commit 38b5933464
8 changed files with 72 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
shell/taskband/src/taskbuttons/windowmonitor.c
View File

@@ -13,7 +13,6 @@ typedef struct _WindowManagerSingle
{
GtkToggleButton* button;
GtkImage* button_icon;
gboolean button_synchronizing;
GtkLabel* button_text;
WinTCWndMgmtWindow* managed_window;
WindowMonitor* parent_monitor;
@@ -60,9 +59,10 @@ static void on_window_state_changed(
gpointer user_data
);
static void on_window_button_toggled(
GtkToggleButton* button,
gpointer user_data
static gboolean on_window_button_button_released(
GtkWidget* self,
GdkEventButton* event,
gpointer user_data
);
static void window_manager_update_icon(
@@ -179,8 +179,8 @@ static void window_manager_update_state(
g_signal_connect(
window_manager->button,
"toggled",
G_CALLBACK(on_window_button_toggled),
"button-release-event",
G_CALLBACK(on_window_button_button_released),
window_manager
);
@@ -260,14 +260,10 @@ static void on_active_window_changed(
window_manager_old->button != NULL
)
{
window_manager_old->button_synchronizing = TRUE;
gtk_toggle_button_set_active(
window_manager_old->button,
FALSE
);
window_manager_old->button_synchronizing = FALSE;
}
}
@@ -284,14 +280,10 @@ static void on_active_window_changed(
window_manager_new->button != NULL
)
{
window_manager_new->button_synchronizing = TRUE;
gtk_toggle_button_set_active(
window_manager_new->button,
TRUE
);
window_manager_new->button_synchronizing = FALSE;
}
}
}
@@ -338,7 +330,6 @@ static void on_window_opened(
window_manager->button = NULL;
window_manager->button_icon = NULL;
window_manager->button_synchronizing = FALSE;
window_manager->button_text = NULL;
window_manager->managed_window = window;
window_manager->parent_monitor = window_monitor;
@@ -403,24 +394,28 @@ static void on_window_state_changed(
window_manager_update_state(window_manager);
}
static void on_window_button_toggled(
GtkToggleButton* button,
gpointer user_data
static gboolean on_window_button_button_released(
GtkWidget* self,
GdkEventButton* event,
gpointer user_data
)
{
GtkToggleButton* toggle_button = GTK_TOGGLE_BUTTON(self);
WindowManagerSingle* window_manager = (WindowManagerSingle*) user_data;
if (window_manager->button_synchronizing)
if (gtk_toggle_button_get_active(toggle_button))
{
return;
}
if (gtk_toggle_button_get_active(button))
{
wintc_wndmgmt_window_unminimize(window_manager->managed_window);
wintc_wndmgmt_window_minimize(
window_manager->managed_window
);
}
else
{
wintc_wndmgmt_window_minimize(window_manager->managed_window);
wintc_wndmgmt_window_unminimize(
window_manager->managed_window,
(guint64) event->time
);
}
}
return FALSE;
}