deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-07-08 12:59:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows taskbar click not minimizing the window

Browse Source
This commit is contained in:
deepend-tildeclub
2026-07-07 23:44:22 -06:00
parent 8466e70424
commit 9465a1e0a8
1 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/fe-gtk/maingui.c
View File

@@ -67,6 +67,34 @@
#include <shellapi.h> #include <shellapi.h>
#include <gdk/gdkwin32.h> #include <gdk/gdkwin32.h>
/* The shell only minimizes a window from its taskbar button when the
* window style carries WS_MINIMIZEBOX; without it the click merely
* deactivates the window (issue #65). GTK3 older than 3.24.50 can drop
* the bit from top-level windows (https://gitlab.gnome.org/GNOME/gtk/-/issues/7494),
* so guarantee it ourselves for session windows. */
static void
mg_win32_ensure_minimizable (GdkWindow *gdk_window)
{
HWND hwnd;
LONG_PTR window_style;
if (!gdk_window)
return;
hwnd = gdk_win32_window_get_handle (gdk_window);
if (!hwnd)
return;
window_style = GetWindowLongPtr (hwnd, GWL_STYLE);
if (!window_style || (window_style & WS_MINIMIZEBOX))
return;
SetWindowLongPtr (hwnd, GWL_STYLE, window_style | WS_MINIMIZEBOX);
SetWindowPos (hwnd, NULL, 0, 0, 0, 0,
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE |
SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOOWNERZORDER);
}
static void static void
mg_win32_allow_autohide_taskbar (GtkWindow *window, GdkEventWindowState *event) mg_win32_allow_autohide_taskbar (GtkWindow *window, GdkEventWindowState *event)
{ {
@@ -4985,6 +5013,7 @@ mg_create_topwindow (session *sess)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
parent_win = gtk_widget_get_window (win); parent_win = gtk_widget_get_window (win);
gdk_window_add_filter (parent_win, mg_win32_filter, NULL); gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
mg_win32_ensure_minimizable (parent_win);
#endif #endif
} }
@@ -5021,6 +5050,18 @@ mg_win32_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
if (!msg) if (!msg)
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
if (msg->message == WM_STYLECHANGING && msg->wParam == (WPARAM)GWL_STYLE)
{
STYLESTRUCT *style = (STYLESTRUCT *)msg->lParam;
/* Keep the window minimizable from its taskbar button; see
* mg_win32_ensure_minimizable (). */
if (style)
style->styleNew |= WS_MINIMIZEBOX;
return GDK_FILTER_CONTINUE;
}
if (msg->message == WM_TIMECHANGE) if (msg->message == WM_TIMECHANGE)
{ {
_tzset(); _tzset();
@@ -5170,6 +5211,7 @@ mg_create_tabwindow (session *sess)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
parent_win = gtk_widget_get_window (win); parent_win = gtk_widget_get_window (win);
gdk_window_add_filter (parent_win, mg_win32_filter, NULL); gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
mg_win32_ensure_minimizable (parent_win);
#endif #endif
} }