gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Source/x11/XGServerWindow.m (placewindow::): check window frame

Browse source 
in OpenStep and Xlib coordinate systems to decide if it was changed.
  Rename `xVal` into more meaninful `xFrame` (holds temporary value of
  window frame in Xlib coordiante system).
This commit is contained in:
Sergii Stoian 2020-03-05 02:10:23 +02:00
parent db1079b5e3
commit fc68da6be2
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2020-03-05 Sergii Stoian <stoyan255@gmail.com>
* Source/x11/XGServerWindow.m (placewindow::): check window frame
in OpenStep and Xlib coordinate systems to decide if it was changed.
Rename `xVal` into more meaninful `xFrame` (holds temporary value of
window frame in Xlib coordiante system).
2020-03-03 Sergii Stoian <stoyan255@gmail.com>
* Headers/x11/XGServer.h,

16
Source/x11/XGServerWindow.m
View file

@ -3217,7 +3217,7 @@ swapColors(unsigned char *image_data, NSBitmapImageRep *rep)
- (void) placewindow: (NSRect)rect : (int)win
{
NSEvent *e;
NSRect xVal;
NSRect xFrame;
NSRect xHint;
gswindow_device_t *window;
NSWindow *nswin;
@ -3233,8 +3233,10 @@ swapColors(unsigned char *image_data, NSBitmapImageRep *rep)
NSDebugLLog(@"XGTrace", @"DPSplacewindow: %@ : %d", NSStringFromRect(rect),
win);
xFrame = [self _OSFrameToXFrame: rect for: window];
if (NSEqualRects(rect, window->osframe) == YES
&& window->map_state == IsViewable)
&& NSEqualRects(xFrame, window->xframe) == YES)
{
return;
}
@ -3244,7 +3246,8 @@ swapColors(unsigned char *image_data, NSBitmapImageRep *rep)
resize = YES;
move = YES;
}
else if (NSEqualPoints(rect.origin, window->osframe.origin) == NO)
else if (NSEqualPoints(rect.origin, window->osframe.origin) == NO
|| NSEqualPoints(xFrame.origin, window->xframe.origin) == NO)
{
move = YES;
}
@ -3264,15 +3267,14 @@ swapColors(unsigned char *image_data, NSBitmapImageRep *rep)
window->siz_hints.flags = flags;
}
xVal = [self _OSFrameToXFrame: rect for: window];
xHint = [self _XFrameToXHints: xVal for: window];
xHint = [self _XFrameToXHints: xFrame for: window];
window->siz_hints.width = (int)xHint.size.width;
window->siz_hints.height = (int)xHint.size.height;
window->siz_hints.x = (int)xHint.origin.x;
window->siz_hints.y = (int)xHint.origin.y;
NSDebugLLog(@"Moving", @"Place %lu - o:%@, x:%@", window->number,
NSStringFromRect(rect), NSStringFromRect(xVal));
NSStringFromRect(rect), NSStringFromRect(xFrame));
XMoveResizeWindow (dpy, window->ident,
window->siz_hints.x, window->siz_hints.y,
window->siz_hints.width, window->siz_hints.height);
@ -3282,7 +3284,7 @@ swapColors(unsigned char *image_data, NSBitmapImageRep *rep)
and we don't have to do anything when the ConfigureNotify arrives later.
If we're wrong, the ConfigureNotify will have the exact coordinates, and
at that point, we'll send new GSAppKitWindow* events to -gui. */
window->xframe = xVal;
window->xframe = xFrame;
/* Update the hints. Note that we do this _after_ updating xframe since
the hint setting code needs the new xframe to work around problems