cpp/openttd-patchpack/source Changeset - r15241:1536e1ddc5ef

Changeset - r15241:1536e1ddc5ef

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

alberth - 14 years ago 2010-05-23 14:53:39
alberth@openttd.org

(svn r19886) -Add [FS#3705]: Perform window callback during mouse dragging for the purpose of highlighting the destination (sbr).

2 files changed with 26 insertions and 0 deletions:

src/window.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/window.cpp

➞

Show inline comments

@@ @@ -1361,48 +1361,66 @@ static void HandlePlacePresize() @@
 	w->OnPlacePresize(pt, TileVirtXY(pt.x, pt.y));
+}
 static bool HandleDragDrop()
+{
 	if (_special_mouse_mode != WSM_DRAGDROP) return true;
 	if (_left_button_down) return false;
 	Window *w = GetCallbackWnd();
 	if (w != NULL) {
 		/* send an event in client coordinates. */
 		Point pt;
 		pt.x = _cursor.pos.x - w->left;
 		pt.y = _cursor.pos.y - w->top;
 		w->OnDragDrop(pt, GetWidgetFromPos(w, pt.x, pt.y));
+	}
 	ResetObjectToPlace();
 	return false;
+}
 static bool HandleMouseDrag()
+{
 	if (_special_mouse_mode != WSM_DRAGDROP) return true;
 	if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) return true;
 	Window *w = GetCallbackWnd();
 	if (w != NULL) {
 		/* Send an event in client coordinates. */
 		Point pt;
 		pt.x = _cursor.pos.x - w->left;
 		pt.y = _cursor.pos.y - w->top;
 		w->OnMouseDrag(pt, GetWidgetFromPos(w, pt.x, pt.y));
+	}
 	return false;
+}
 static bool HandleMouseOver()
+{
 	Window *w = FindWindowFromPt(_cursor.pos.x, _cursor.pos.y);
 	/* We changed window, put a MOUSEOVER event to the last window */
 	if (_mouseover_last_w != NULL && _mouseover_last_w != w) {
 		/* Reset mouse-over coordinates of previous window */
 		Point pt = { -1, -1 };
 		_mouseover_last_w->OnMouseOver(pt, 0);
+	}
 	/* _mouseover_last_w will get reset when the window is deleted, see DeleteWindow() */
 	_mouseover_last_w = w;
 	if (w != NULL) {
 		/* send an event in client coordinates. */
 		Point pt = { _cursor.pos.x - w->left, _cursor.pos.y - w->top };
 		const NWidgetCore *widget = w->nested_root->GetWidgetFromPos(pt.x, pt.y);
 		if (widget != NULL) w->OnMouseOver(pt, widget->index);
+	}
 	/* Mouseover never stops execution */
 	return true;
+}
@@ @@ -2036,48 +2054,49 @@ static const int8 scrollamt[16][2] = { @@
 	{ 2,  1}, ///< 12 : down  + right
 	{ 0,  2}, ///< 13 : left  + right +  down = down
 	{ 2,  0}, ///< 14 : right + up    +  down = right
 	{ 0,  0}, ///< 15 : left  + up    +  right + down  = nothing
 };
 static void HandleKeyScrolling()
+{
 	/*
 	 * Check that any of the dirkeys is pressed and that the focused window
 	 * dont has an edit-box as focused widget.
 	 */
 	if (_dirkeys && !EditBoxInGlobalFocus()) {
 		int factor = _shift_pressed ? 50 : 10;
 		ScrollMainViewport(scrollamt[_dirkeys][0] * factor, scrollamt[_dirkeys][1] * factor);
+	}
+}
 static void MouseLoop(MouseClick click, int mousewheel)
+{
 	HandlePlacePresize();
 	UpdateTileSelection();
 	if (!VpHandlePlaceSizingDrag())  return;
 	if (!HandleMouseDrag())          return;
 	if (!HandleDragDrop())           return;
 	if (!HandleWindowDragging())     return;
 	if (!HandleScrollbarScrolling()) return;
 	if (!HandleViewportScroll())     return;
 	if (!HandleMouseOver())          return;
 	bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == 1 && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
 	if (click == MC_NONE && mousewheel == 0 && !scrollwheel_scrolling) return;
 	int x = _cursor.pos.x;
 	int y = _cursor.pos.y;
 	Window *w = FindWindowFromPt(x, y);
 	if (w == NULL) return;
 	if (!MaybeBringWindowToFront(w)) return;
 	ViewPort *vp = IsPtInWindowViewport(w, x, y);
 	/* Don't allow any action in a viewport if either in menu of in generating world */
 	if (vp != NULL && (_game_mode == GM_MENU || IsGeneratingWorld())) return;
 	if (mousewheel != 0) {
 		if (_settings_client.gui.scrollwheel_scrolling == 0) {
 			/* Send mousewheel event to window */
 			w->OnMouseWheel(mousewheel);

src/window_gui.h

➞

Show inline comments

@@ @@ -636,48 +636,55 @@ public: @@
 	/**
 	 * The state of the control key has changed
 	 * @return #ES_HANDLED if the change has been handled and no other
 	 *         window should receive the event.
 	 */
 	virtual EventState OnCTRLStateChange() { return ES_NOT_HANDLED; }
 	/**
 	 * A click with the left mouse button has been made on the window.
 	 * @param pt     the point inside the window that has been clicked.
 	 * @param widget the clicked widget.
 	 * @param click_count Number of fast consecutive clicks at same position
 	 */
 	virtual void OnClick(Point pt, int widget, int click_count) {}
 	/**
 	 * A click with the right mouse button has been made on the window.
 	 * @param pt     the point inside the window that has been clicked.
 	 * @param widget the clicked widget.
 	 */
 	virtual void OnRightClick(Point pt, int widget) {}
 	/**
 	 * An 'object' is being dragged at the provided position, highlight the target if possible.
 	 * @param pt     The point inside the window that the mouse hovers over.
 	 * @param widget The widget the mouse hovers over.
 	 */
 	virtual void OnMouseDrag(Point pt, int widget) {}
 	/**
 	 * A dragged 'object' has been released.
 	 * @param pt     the point inside the window where the release took place.
 	 * @param widget the widget where the release took place.
 	 */
 	virtual void OnDragDrop(Point pt, int widget) {}
 	/**
 	 * Handle the request for (viewport) scrolling.
 	 * @param delta the amount the viewport must be scrolled.
 	 */
 	virtual void OnScroll(Point delta) {}
 	/**
 	 * The mouse is currently moving over the window or has just moved outside
 	 * of the window. In the latter case pt is (-1, -1).
 	 * @param pt     the point inside the window that the mouse hovers over.
 	 * @param widget the widget the mouse hovers over.
 	 */
 	virtual void OnMouseOver(Point pt, int widget) {}
 	/**
 	 * The mouse wheel has been turned.
 	 * @param wheel the amount of movement of the mouse wheel.
 	 */

0 comments (0 inline, 0 general)