From d9b6bec9e5e58be10d44749ac83be831bc42875c Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 14 Apr 2024 12:43:53 +0200 Subject: [PATCH] Add debug again --- app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp | 8 +++++++- app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.cpp | 7 ++++++- app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.h | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp b/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp index 0835d92..681c46e 100644 --- a/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp +++ b/app/SysTray-X/SysTray-X-app/windowctrl-unix.cpp @@ -389,7 +389,11 @@ void WindowCtrlUnix::updatePositions() */ int x; int y; - GetWindowPosition( m_display, window, &x, &y ); + int x1; + int y1; + int x2; + int y2; + GetWindowPosition( m_display, window, &x, &y, &x1, &y1, &x2, &y2 ); /* * Update the list? @@ -408,6 +412,8 @@ void WindowCtrlUnix::updatePositions() //#ifdef DEBUG_DISPLAY_ACTIONS_DETAILS emit signalConsole( QString( "Update pos: %1, %2" ).arg( x ).arg( y ) ); + emit signalConsole( QString( "Update pos1: %1, %2" ).arg( x1 ).arg( y1 ) ); + emit signalConsole( QString( "Update pos2: %1, %2" ).arg( x2 ).arg( y2 ) ); emit signalConsole( QString( "Update pos corrected: %1, %2" ).arg( x - left ).arg( y - top ) ); //#endif } diff --git a/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.cpp b/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.cpp index 5371e4e..1ca0fc1 100644 --- a/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.cpp +++ b/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.cpp @@ -460,7 +460,7 @@ void GetWindowFrameExtensions( void *display, quint64 window, int* left, int* /* * Get the window position */ -void GetWindowPosition( void* display, quint64 window, int* pos_x, int* pos_y ) +void GetWindowPosition( void* display, quint64 window, int* pos_x, int* pos_y, int* x1d, int* y1d, int* x2d, int* y2d ) { Display* dsp = (Display*)display; @@ -498,6 +498,11 @@ void GetWindowPosition( void* display, quint64 window, int* pos_x, int* pos_y *pos_x = x - xwa.x; *pos_y = y - xwa.y; + + *x1d = x1; + *y1d = y1; + *x2d = x2; + *y2d = y2; } diff --git a/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.h b/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.h index a99b77f..e4b41c3 100644 --- a/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.h +++ b/app/SysTray-X/SysTray-X-lib-x11/systray-x-lib-x11.h @@ -251,7 +251,7 @@ void GetWindowFrameExtensions( void *display, quint64 window, int* left, int* * @param pos_x Storage for the x coordinate * @param pos_y Storage for the y coordinate */ -void GetWindowPosition( void *display, quint64 window, int* pos_x, int* pos_y ); +void GetWindowPosition( void *display, quint64 window, int* pos_x, int* pos_y, int* x1d, int* y1d, int* x2d, int* y2d ); /** * @brief GetWindowRectangle. Get the window rectangle.