From e11c20b9ed79144b51b4e3c0092f758a01ef9c45 Mon Sep 17 00:00:00 2001 From: rfm Date: Sat, 9 Sep 2006 07:59:59 +0000 Subject: [PATCH] Fix transform error. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@23439 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/x11/XGServerWindow.m | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63333b6..46a804e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-09 Richard Frith-Macdonald + + * Source/x11/XGServerWindow.m: ([_XFrameToOSFrame:for:]) fix transform + error. + 2006-09-08 Adam Fedor Tools/gpbs.1: Add documentation on options (from Dennis Leeuw). diff --git a/Source/x11/XGServerWindow.m b/Source/x11/XGServerWindow.m index 205c754..1f9bef2 100644 --- a/Source/x11/XGServerWindow.m +++ b/Source/x11/XGServerWindow.m @@ -416,8 +416,8 @@ static void setWindowHintsForStyle (Display *dpy, Window window, x.size.width = o.size.width - l - r; x.size.height = o.size.height - t - b; x.origin.x = o.origin.x + l; - x.origin.y = o.origin.y + o.size.height; - x.origin.y = DisplayHeight(dpy, win->screen) - x.origin.y + t; + x.origin.y = o.origin.y + o.size.height - t; + x.origin.y = DisplayHeight(dpy, win->screen) - x.origin.y; NSDebugLLog(@"Frame", @"O2X %d, %x, %@, %@", win->number, style, NSStringFromRect(o), NSStringFromRect(x)); return x; @@ -481,9 +481,8 @@ static void setWindowHintsForStyle (Display *dpy, Window window, [self styleoffsets: &l : &r : &t : &b : style : win->ident]; o = x; - o.origin.y = o.origin.y + o.size.height + t; - o.origin.y = DisplayHeight(dpy, win->screen) - o.origin.y; - o.origin.y -= b; + o.origin.y = DisplayHeight(dpy, win->screen) - x.origin.y; + o.origin.y = o.origin.y - x.size.height - b; o.origin.x -= l; o.size.width += l + r; o.size.height += t + b;