[haiku-commits] r39745 - haiku/trunk/src/add-ons/decorators/SATDecorator
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 5 Dec 2010 20:33:16 +0100 (CET)
Author: czeidler
Date: 2010-12-05 20:33:16 +0100 (Sun, 05 Dec 2010)
New Revision: 39745
Changeset: http://dev.haiku-os.org/changeset/39745
Modified:
haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
Log:
As suggested by J?\195?\169r?\195?\180me remove one level of indentation.
Modified: haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
===================================================================
--- haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
2010-12-05 19:15:57 UTC (rev 39744)
+++ haiku/trunk/src/add-ons/decorators/SATDecorator/SATWindow.cpp
2010-12-05 19:33:16 UTC (rev 39745)
@@ -794,37 +794,36 @@
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);
}
}
Other related posts:
- » [haiku-commits] r39745 - haiku/trunk/src/add-ons/decorators/SATDecorator - clemens . zeidler
