Fixes to decorators broken by tweaks to click_type in Decorator.h
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5401 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -128,23 +128,23 @@ else
|
||||
}
|
||||
#endif
|
||||
if(_closerect.Contains(pt))
|
||||
return CLICK_CLOSE;
|
||||
return DEC_CLOSE;
|
||||
|
||||
if(_zoomrect.Contains(pt))
|
||||
return CLICK_ZOOM;
|
||||
return DEC_ZOOM;
|
||||
|
||||
if(_resizerect.Contains(pt) && _look==B_DOCUMENT_WINDOW_LOOK)
|
||||
return CLICK_RESIZE;
|
||||
return DEC_RESIZE;
|
||||
|
||||
// Clicking in the tab?
|
||||
if(_tabrect.Contains(pt))
|
||||
{
|
||||
// Here's part of our window management stuff
|
||||
// if(buttons==B_PRIMARY_MOUSE_BUTTON && !GetFocus())
|
||||
// return CLICK_MOVETOFRONT;
|
||||
// return DEC_MOVETOFRONT;
|
||||
if(buttons==B_SECONDARY_MOUSE_BUTTON)
|
||||
return CLICK_MOVETOBACK;
|
||||
return CLICK_DRAG;
|
||||
return DEC_MOVETOBACK;
|
||||
return DEC_DRAG;
|
||||
}
|
||||
|
||||
// We got this far, so user is clicking on the border?
|
||||
@@ -154,13 +154,13 @@ else
|
||||
if(brect.Contains(pt) && !clientrect.Contains(pt))
|
||||
{
|
||||
if(_resizerect.Contains(pt))
|
||||
return CLICK_RESIZE;
|
||||
return DEC_RESIZE;
|
||||
|
||||
return CLICK_DRAG;
|
||||
return DEC_DRAG;
|
||||
}
|
||||
|
||||
// Guess user didn't click anything
|
||||
return CLICK_NONE;
|
||||
return DEC_NONE;
|
||||
}
|
||||
|
||||
void BeDecorator::_DoLayout(void)
|
||||
|
||||
@@ -52,7 +52,7 @@ click_type MacDecorator::Clicked(BPoint pt, int32 buttons, int32 modifiers)
|
||||
printf("MacDecorator():Clicked() - Close\n");
|
||||
#endif
|
||||
|
||||
return CLICK_CLOSE;
|
||||
return DEC_CLOSE;
|
||||
}
|
||||
|
||||
if(_zoomrect.Contains(pt))
|
||||
@@ -62,7 +62,7 @@ printf("MacDecorator():Clicked() - Close\n");
|
||||
printf("MacDecorator():Clicked() - Zoom\n");
|
||||
#endif
|
||||
|
||||
return CLICK_ZOOM;
|
||||
return DEC_ZOOM;
|
||||
}
|
||||
|
||||
// Clicking in the tab?
|
||||
@@ -70,8 +70,8 @@ printf("MacDecorator():Clicked() - Zoom\n");
|
||||
{
|
||||
// Here's part of our window management stuff
|
||||
if(buttons==B_PRIMARY_MOUSE_BUTTON && !GetFocus())
|
||||
return CLICK_MOVETOFRONT;
|
||||
return CLICK_DRAG;
|
||||
return DEC_MOVETOFRONT;
|
||||
return DEC_DRAG;
|
||||
}
|
||||
|
||||
// We got this far, so user is clicking on the border?
|
||||
@@ -83,14 +83,14 @@ printf("MacDecorator():Clicked() - Zoom\n");
|
||||
#ifdef DEBUG_DECOR
|
||||
printf("MacDecorator():Clicked() - Resize\n");
|
||||
#endif
|
||||
return CLICK_RESIZE;
|
||||
return DEC_RESIZE;
|
||||
}
|
||||
|
||||
// Guess user didn't click anything
|
||||
#ifdef DEBUG_DECOR
|
||||
printf("MacDecorator():Clicked()\n");
|
||||
#endif
|
||||
return CLICK_NONE;
|
||||
return DEC_NONE;
|
||||
}
|
||||
|
||||
void MacDecorator::_DoLayout(void)
|
||||
|
||||
@@ -46,7 +46,7 @@ click_type WinDecorator::Clicked(BPoint pt, int32 buttons, int32 modifiers)
|
||||
printf("WinDecorator():Clicked() - Close\n");
|
||||
#endif
|
||||
|
||||
return CLICK_CLOSE;
|
||||
return DEC_CLOSE;
|
||||
}
|
||||
|
||||
if(_zoomrect.Contains(pt))
|
||||
@@ -56,7 +56,7 @@ printf("WinDecorator():Clicked() - Close\n");
|
||||
printf("WinDecorator():Clicked() - Zoom\n");
|
||||
#endif
|
||||
|
||||
return CLICK_ZOOM;
|
||||
return DEC_ZOOM;
|
||||
}
|
||||
|
||||
// Clicking in the tab?
|
||||
@@ -64,8 +64,8 @@ printf("WinDecorator():Clicked() - Zoom\n");
|
||||
{
|
||||
// Here's part of our window management stuff
|
||||
if(buttons==B_PRIMARY_MOUSE_BUTTON && !GetFocus())
|
||||
return CLICK_MOVETOFRONT;
|
||||
return CLICK_DRAG;
|
||||
return DEC_MOVETOFRONT;
|
||||
return DEC_DRAG;
|
||||
}
|
||||
|
||||
// We got this far, so user is clicking on the border?
|
||||
@@ -77,14 +77,14 @@ printf("WinDecorator():Clicked() - Zoom\n");
|
||||
#ifdef DEBUG_DECOR
|
||||
printf("WinDecorator():Clicked() - Resize\n");
|
||||
#endif
|
||||
return CLICK_RESIZE;
|
||||
return DEC_RESIZE;
|
||||
}
|
||||
|
||||
// Guess user didn't click anything
|
||||
#ifdef DEBUG_DECOR
|
||||
printf("WinDecorator():Clicked()\n");
|
||||
#endif
|
||||
return CLICK_NONE;
|
||||
return DEC_NONE;
|
||||
}
|
||||
|
||||
void WinDecorator::_DoLayout(void)
|
||||
|
||||
Reference in New Issue
Block a user