i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some resizable checks that were missing.

Browse Source 
Now, borders that can be resize are not highlight anymore,
and it's no more possible to resize a non-resizable
(vertical/horizontal/all directions) window with the third button + CMD + ALT.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39705 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2010-12-02 18:12:18 +00:00
parent 9119091a71
commit 8490a52529
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/DefaultWindowBehaviour.cpp
+23 -9
View File
@@ -432,6 +432,15 @@ struct DefaultWindowBehaviour::ResizeBorderState : MouseTrackingState {
virtual void EnterState(State* previousState) virtual void EnterState(State* previousState)
{ {
if ((fWindow->Flags() & B_NOT_RESIZABLE) != 0)
fHorizontal = fVertical = NONE;
else {
if ((fWindow->Flags() & B_NOT_H_RESIZABLE) != 0)
fHorizontal = NONE;
if ((fWindow->Flags() & B_NOT_V_RESIZABLE) != 0)
fVertical = NONE;
}
fBehavior._SetResizeCursor(fHorizontal, fVertical); fBehavior._SetResizeCursor(fHorizontal, fVertical);
} }
@@ -442,14 +451,9 @@ struct DefaultWindowBehaviour::ResizeBorderState : MouseTrackingState {
virtual void MouseMovedAction(BPoint& delta, bigtime_t now) virtual void MouseMovedAction(BPoint& delta, bigtime_t now)
{ {
if ((fWindow->Flags() & B_NOT_RESIZABLE) != 0) { if (fHorizontal == NONE)
delta = BPoint(0, 0);
return;
}
if ((fWindow->Flags() & B_NOT_H_RESIZABLE) != 0 || fHorizontal == NONE)
delta.x = 0; delta.x = 0;
if ((fWindow->Flags() & B_NOT_V_RESIZABLE) != 0 || fVertical == NONE) if (fVertical == NONE)
delta.y = 0; delta.y = 0;
if (delta.x == 0 && delta.y == 0) if (delta.x == 0 && delta.y == 0)
@@ -656,6 +660,9 @@ struct DefaultWindowBehaviour::ManageWindowState : State {
private: private:
void _UpdateBorders(BPoint where) void _UpdateBorders(BPoint where)
{ {
if ((fWindow->Flags() & B_NOT_RESIZABLE) != 0)
return;
// Compute the window center relative location of where. We divide by // Compute the window center relative location of where. We divide by
// the width respective the height, so we compensate for the window's // the width respective the height, so we compensate for the window's
// aspect ratio. // aspect ratio.
@@ -673,6 +680,11 @@ private:
int8 vertical; int8 vertical;
_ComputeResizeDirection(x, y, horizontal, vertical); _ComputeResizeDirection(x, y, horizontal, vertical);
if ((fWindow->Flags() & B_NOT_H_RESIZABLE) != 0)
horizontal = NONE;
if ((fWindow->Flags() & B_NOT_V_RESIZABLE) != 0)
vertical = NONE;
// update the highlight, if necessary // update the highlight, if necessary
if (horizontal != fHorizontal || vertical != fVertical) { if (horizontal != fHorizontal || vertical != fVertical) {
fBehavior._SetBorderHighlights(fHorizontal, fVertical, false); fBehavior._SetBorderHighlights(fHorizontal, fVertical, false);
@@ -892,8 +904,10 @@ DefaultWindowBehaviour::MouseDown(BMessage* message, BPoint where,
} else if ((buttons & B_TERTIARY_MOUSE_BUTTON) != 0) { } else if ((buttons & B_TERTIARY_MOUSE_BUTTON) != 0) {
// Middle-click anywhere on the window shall initiate // Middle-click anywhere on the window shall initiate
// humdinger-resize mode. // humdinger-resize mode.
if (windowModifier && hitRegion != Decorator::REGION_NONE) if (windowModifier && hitRegion != Decorator::REGION_NONE) {
action = ACTION_HUMDINGER_RESIZE; action = (flags & B_NOT_RESIZABLE) == 0
? ACTION_HUMDINGER_RESIZE : ACTION_DRAG;
}
} }
} }