From ace5bba0ed722cbf69369782f0124b4c2ed752af Mon Sep 17 00:00:00 2001 From: bjcollins Date: Thu, 15 Oct 2015 19:10:04 -0500 Subject: [PATCH] Cleanup unnecessary/unintended changes from last commit --- client/X11/xf_event.c | 3 +-- client/X11/xf_window.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c index 18328f3..5f13d50 100644 --- a/client/X11/xf_event.c +++ b/client/X11/xf_event.c @@ -278,8 +278,7 @@ BOOL xf_generic_MotionNotify(xfContext* xfc, int x, int y, int state, Window win xf_event_adjust_coordinates(xfc, &x, &y); - if (!app || xf_AppWindowFromX11Window(xfc,window)->local_move.direction != RAIL_WMSZ_KEYSIZE) - input->MouseEvent(input, PTR_FLAGS_MOVE, x, y); + input->MouseEvent(input, PTR_FLAGS_MOVE, x, y); if (xfc->fullscreen && !app) { diff --git a/client/X11/xf_window.c b/client/X11/xf_window.c index f4c832b..973cc23 100644 --- a/client/X11/xf_window.c +++ b/client/X11/xf_window.c @@ -959,10 +959,10 @@ void xf_UpdateWindowArea(xfContext* xfc, xfAppWindow* appWindow, int x, int y, i ax = x + appWindow->windowOffsetX; ay = y + appWindow->windowOffsetY; - if (ax + width > appWindow->windowOffsetX + appWindow->windowWidth) - width = (appWindow->windowOffsetX + appWindow->windowWidth - 1) - ax; - if (ay + height > appWindow->windowOffsetY + appWindow->windowHeight) - height = (appWindow->windowOffsetY + appWindow->windowHeight - 1) - ay; + if (ax + width > appWindow->windowOffsetX + appWindow->width) + width = (appWindow->windowOffsetX + appWindow->width - 1) - ax; + if (ay + height > appWindow->windowOffsetY + appWindow->height) + height = (appWindow->windowOffsetY + appWindow->height - 1) - ay; xf_lock_x11(xfc, TRUE); -- 2.7.4