|
@@ -317,33 +317,33 @@ static void DispatchLeftClickEvent(Windo
|
|
|
if (w->desc_flags & WDF_STD_BTN) {
|
|
|
if (widget_type == WWT_CLOSEBOX) { // 'X'
|
|
|
delete w;
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
if (widget_type == WWT_CAPTION) { // 'Title bar'
|
|
|
StartWindowDrag(w);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if (w->desc_flags & WDF_RESIZABLE && widget_type == WWT_RESIZEBOX) {
|
|
|
if ((w->desc_flags & WDF_RESIZABLE) && widget_type == WWT_RESIZEBOX) {
|
|
|
/* 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_index);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
if (w->desc_flags & WDF_STICKY_BUTTON && widget_type == WWT_STICKYBOX) {
|
|
|
if ((w->desc_flags & WDF_STICKY_BUTTON) && widget_type == WWT_STICKYBOX) {
|
|
|
w->flags4 ^= WF_STICKY;
|
|
|
w->InvalidateWidget(widget_index);
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
Point pt = { x, y };
|
|
|
|
|
|
if (double_click) {
|
|
|
w->OnDoubleClick(pt, widget_index);
|
|
|
} else {
|
|
|
w->OnClick(pt, widget_index);
|
|
@@ -1231,25 +1231,25 @@ static void DecreaseWindowCounters()
|
|
|
{
|
|
|
Window *w;
|
|
|
FOR_ALL_WINDOWS_FROM_FRONT(w) {
|
|
|
/* Unclick scrollbar buttons if they are pressed. */
|
|
|
if (w->flags4 & (WF_SCROLL_DOWN | WF_SCROLL_UP)) {
|
|
|
w->flags4 &= ~(WF_SCROLL_DOWN | WF_SCROLL_UP);
|
|
|
w->SetDirty();
|
|
|
}
|
|
|
w->OnMouseLoop();
|
|
|
}
|
|
|
|
|
|
FOR_ALL_WINDOWS_FROM_FRONT(w) {
|
|
|
if (w->flags4 & WF_TIMEOUT_MASK && !(--w->flags4 & WF_TIMEOUT_MASK)) {
|
|
|
if ((w->flags4 & WF_TIMEOUT_MASK) && !(--w->flags4 & WF_TIMEOUT_MASK)) {
|
|
|
w->OnTimeout();
|
|
|
if (w->desc_flags & WDF_UNCLICK_BUTTONS) w->RaiseButtons();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
Window *GetCallbackWnd()
|
|
|
{
|
|
|
return FindWindowById(_thd.window_class, _thd.window_number);
|
|
|
}
|
|
|
|
|
|
static void HandlePlacePresize()
|
|
@@ -1542,25 +1542,25 @@ static bool HandleWindowDragging()
|
|
|
if ((int)w->width + x < (int)w->resize.width) {
|
|
|
x = w->resize.width - w->width;
|
|
|
}
|
|
|
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.y += y;
|
|
|
if (w->flags4 & WF_SIZING_LEFT && x != 0) {
|
|
|
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);
|
|
|
|
|
|
Point diff;
|