dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15760) -Codechange [FS#2704]: support that the resize box is at the left side of the window too (based on work by Alberth)

Browse Source
This commit is contained in:
rubidium
2009-03-18 01:06:48 +00:00
parent c0a4498518
commit 35e4dc0f4b
9 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/window.cpp
View File

@@ -228,7 +228,7 @@ bool Window::HasWidgetOfType(WidgetType widget_type) const
}
static void StartWindowDrag(Window *w);
static void StartWindowSizing(Window *w);
static void StartWindowSizing(Window *w, bool to_left);
/**
* Dispatch left mouse-button (possibly double) click in window.
@@ -322,7 +322,9 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, bool double_click)
}
if (w->desc_flags & WDF_RESIZABLE && wi->type == WWT_RESIZEBOX) {
StartWindowSizing(w);
/* When the resize widget is on the left size of the window
* we assume that that button is used to resize to the left. */
StartWindowSizing(w, wi->left < (w->width / 2));
w->InvalidateWidget(widget);
return;
}
@@ -1511,8 +1513,6 @@ static bool HandleWindowDragging()
w->SetDirty();
return false;
} else if (w->flags4 & WF_SIZING) {
int x, y;
/* Stop the sizing if the left mouse button was released */
if (!_left_button_down) {
w->flags4 &= ~WF_SIZING;
@@ -1520,8 +1520,15 @@ static bool HandleWindowDragging()
break;
}
x = _cursor.pos.x - _drag_delta.x;
y = _cursor.pos.y - _drag_delta.y;
/* Compute difference in pixels between cursor position and reference point in the window.
* If resizing the left edge of the window, moving to the left makes the window bigger not smaller.
*/
int x, y = _cursor.pos.y - _drag_delta.y;
if (w->flags4 & WF_SIZING_LEFT) {
x = _drag_delta.x - _cursor.pos.x;
} else {
x = _cursor.pos.x - _drag_delta.x;
}
/* X and Y has to go by step.. calculate it.
* The cast to int is necessary else x/y are implicitly casted to
@@ -1531,18 +1538,26 @@ static bool HandleWindowDragging()
if (w->resize.step_height > 1) y -= y % (int)w->resize.step_height;
/* Check if we don't go below the minimum set size */
if ((int)w->width + x < (int)w->resize.width)
if ((int)w->width + x < (int)w->resize.width) {
x = w->resize.width - w->width;
if ((int)w->height + y < (int)w->resize.height)
}
if ((int)w->height + y < (int)w->resize.height) {
y = w->resize.height - w->height;
}
/* Window already on size */
if (x == 0 && y == 0) return false;
/* Now find the new cursor pos.. this is NOT _cursor, because
we move in steps. */
_drag_delta.x += x;
/* Now find the new cursor pos.. this is NOT _cursor, because we move in steps. */
_drag_delta.y += y;
if (w->flags4 & WF_SIZING_LEFT && x != 0) {
_drag_delta.x -= x; // x > 0 -> window gets longer -> left-edge moves to left -> subtract x to get new position.
w->SetDirty();
w->left -= x; // If dragging left edge, move left window edge in opposite direction by the same amount.
/* ResizeWindow() below ensures marking new position as dirty. */
} else {
_drag_delta.x += x;
}
/* ResizeWindow sets both pre- and after-size to dirty for redrawal */
ResizeWindow(w, x, y);
@@ -1579,12 +1594,13 @@ static void StartWindowDrag(Window *w)
}
/**
* Start resizing a window
* @param w Window to start resizing
* Start resizing a window.
* @param w Window to start resizing.
* @param to_left Whether to drag towards the left or not
*/
static void StartWindowSizing(Window *w)
static void StartWindowSizing(Window *w, bool to_left)
{
w->flags4 |= WF_SIZING;
w->flags4 |= to_left ? WF_SIZING_LEFT : WF_SIZING_RIGHT;
_dragging_window = true;
_drag_delta.x = _cursor.pos.x;