From fd5a5935a73ea09bca9c230b5c39ccfd48b25cfb Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 5 Dec 2010 19:33:16 +0000 Subject: [PATCH] =?UTF-8?q?As=20suggested=20by=20J=C3=A9r=C3=B4me=20remove?= =?UTF-8?q?=20one=20level=20of=20indentation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39745 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../decorators/SATDecorator/SATWindow.cpp | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/src/add-ons/decorators/SATDecorator/SATWindow.cpp b/src/add-ons/decorators/SATDecorator/SATWindow.cpp index 80e5a47f6c..bc12edf0a5 100644 --- a/src/add-ons/decorators/SATDecorator/SATWindow.cpp +++ b/src/add-ons/decorators/SATDecorator/SATWindow.cpp @@ -794,37 +794,36 @@ SATWindow::_RestoreOriginalSize(bool stayBelowMouse) int32 buttons; fDesktop->GetLastMouseState(&mousePosition, &buttons); SATDecorator* decorator = GetDecorator(); - if (decorator) { - BRect tabRect = decorator->TabRect(); - if (mousePosition.y < tabRect.bottom - && mousePosition.x <= frame.right + decorator->BorderWidth() +1 - && mousePosition.x >= frame.left + decorator->BorderWidth()) { - // verify mouse stays on the tab - float deltaX = 0; - if (tabRect.right < mousePosition.x) - deltaX = mousePosition.x - tabRect.right + 20; - else if (tabRect.left > mousePosition.x) - deltaX = mousePosition.x - tabRect.left - 20; - fDesktop->MoveWindowBy(fWindow, deltaX, 0); - } else { - // verify mouse stays on the border - float deltaX = 0; - float deltaY = 0; - BRect newFrame = fWindow->Frame(); - if (x != 0 && mousePosition.x > frame.left - && mousePosition.x > newFrame.right) { - deltaX = mousePosition.x - newFrame.right; - if (mousePosition.x > frame.right) - deltaX -= mousePosition.x - frame.right; - } - if (y != 0 && mousePosition.y > frame.top - && mousePosition.y > newFrame.bottom) { - deltaY = mousePosition.y - newFrame.bottom; - if (mousePosition.y > frame.bottom) - deltaY -= mousePosition.y - frame.bottom; - } - - fDesktop->MoveWindowBy(fWindow, deltaX, deltaY); + if (decorator == NULL) + return; + BRect tabRect = decorator->TabRect(); + if (mousePosition.y < tabRect.bottom + && mousePosition.x <= frame.right + decorator->BorderWidth() +1 + && mousePosition.x >= frame.left + decorator->BorderWidth()) { + // verify mouse stays on the tab + float deltaX = 0; + if (tabRect.right < mousePosition.x) + deltaX = mousePosition.x - tabRect.right + 20; + else if (tabRect.left > mousePosition.x) + deltaX = mousePosition.x - tabRect.left - 20; + fDesktop->MoveWindowBy(fWindow, deltaX, 0); + } else { + // verify mouse stays on the border + float deltaX = 0; + float deltaY = 0; + BRect newFrame = fWindow->Frame(); + if (x != 0 && mousePosition.x > frame.left + && mousePosition.x > newFrame.right) { + deltaX = mousePosition.x - newFrame.right; + if (mousePosition.x > frame.right) + deltaX -= mousePosition.x - frame.right; } + if (y != 0 && mousePosition.y > frame.top + && mousePosition.y > newFrame.bottom) { + deltaY = mousePosition.y - newFrame.bottom; + if (mousePosition.y > frame.bottom) + deltaY -= mousePosition.y - frame.bottom; + } + fDesktop->MoveWindowBy(fWindow, deltaX, deltaY); } }