... actually, "unnest" the rest of the file as well.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28095 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-10-14 17:25:42 +00:00
parent 80e1925251
commit 8eeb005f20
+8 -4
View File
@@ -216,7 +216,10 @@ PadView::MouseUp(BPoint where)
void void
PadView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage) PadView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
{ {
if (MainWindow* window = dynamic_cast<MainWindow*>(Window())) { MainWindow* window = dynamic_cast<MainWindow*>(Window());
if (window == NULL)
return;
if (fDragging) { if (fDragging) {
window->MoveTo(ConvertToScreen(where) - fDragOffset); window->MoveTo(ConvertToScreen(where) - fDragOffset);
} else if (window->AutoRaise()) { } else if (window->AutoRaise()) {
@@ -249,7 +252,6 @@ PadView::MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage)
window->Activate(); window->Activate();
} }
} }
}
} }
// AddButton // AddButton
@@ -280,7 +282,10 @@ PadView::ButtonAt(int32 index) const
void void
PadView::DisplayMenu(BPoint where, LaunchButton* button) const PadView::DisplayMenu(BPoint where, LaunchButton* button) const
{ {
if (MainWindow* window = dynamic_cast<MainWindow*>(Window())) { MainWindow* window = dynamic_cast<MainWindow*>(Window());
if (window == NULL)
return;
LaunchButton* nearestButton = button; LaunchButton* nearestButton = button;
if (!nearestButton) { if (!nearestButton) {
// find the nearest button // find the nearest button
@@ -389,7 +394,6 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const
BRect mouseRect(where, where); BRect mouseRect(where, where);
mouseRect.InsetBy(-4.0, -4.0); mouseRect.InsetBy(-4.0, -4.0);
menu->Go(where, true, false, mouseRect, true); menu->Go(where, true, false, mouseRect, true);
}
} }
// SetOrientation // SetOrientation