From 609b465638367388fdc3970fd9ca4b90cdf77700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 28 Apr 2005 09:44:29 +0000 Subject: [PATCH] fixed BView::MoveTo() and BView::ResizeTo(), fixed typo git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12487 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Layer.cpp | 2 +- src/servers/app/ServerWindow.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/servers/app/Layer.cpp b/src/servers/app/Layer.cpp index 0decfe844f..294fa45459 100644 --- a/src/servers/app/Layer.cpp +++ b/src/servers/app/Layer.cpp @@ -978,7 +978,7 @@ Layer::ResizeBy(float x, float y) if(!fParent) { - printf("ERROR: in Layer::MoveBy()! - No parent!\n"); + printf("ERROR: in Layer::ResizeBy()! - No parent!\n"); return; } diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp index d27779b45a..be3f481228 100644 --- a/src/servers/app/ServerWindow.cpp +++ b/src/servers/app/ServerWindow.cpp @@ -706,8 +706,11 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) link.Read(&x); link.Read(&y); - - cl->MoveBy(x, y); + + float offsetX = x - cl->fFrame.left; + float offsetY = y - cl->fFrame.top; + + cl->MoveBy(offsetX, offsetY); break; } @@ -719,9 +722,12 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link) link.Read(&newWidth); link.Read(&newHeight); - // TODO: Check for minimum size allowed. Need WinBorder::GetSizeLimits - - cl->ResizeBy(newWidth, newHeight); + // TODO: If cl is a window, check for minimum size allowed. + // Need WinBorder::GetSizeLimits + float deltaWidth = newWidth - cl->fFrame.Width(); + float deltaHeight = newHeight - cl->fFrame.Height(); + + cl->ResizeBy(deltaWidth, deltaHeight); break; }