diff options
author | frosch <frosch@openttd.org> | 2010-08-12 09:09:24 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2010-08-12 09:09:24 +0000 |
commit | 57c063250fb8234f17ceda91fb87c2057d5d212e (patch) | |
tree | 170b6f5a5fad0197e91b0d9df979521121803884 /src/window_gui.h | |
parent | 66e48dfdce40b2fac38ae5931581d24fded4265e (diff) | |
download | openttd-57c063250fb8234f17ceda91fb87c2057d5d212e.tar.xz |
(svn r20457) -Codechange: Remove _scrolling_scrollbar and WF_SCROLL_MIDDLE and instead store the widget index of the being scrolled scrollbar in the Window.
Diffstat (limited to 'src/window_gui.h')
-rw-r--r-- | src/window_gui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/window_gui.h b/src/window_gui.h index 1f51c3aa5..9c7192399 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -398,6 +398,8 @@ public: NWidgetStacked *shade_select; ///< Selection widget (#NWID_SELECTION) to use for shading the window. If \c NULL, window cannot shade. Dimension unshaded_size; ///< Last known unshaded size (only valid while shaded). + int scrolling_scrollbar; ///< Widgetindex of just being dragged scrollbar. -1 of none is active. + Window *parent; ///< Parent window. Window *z_front; ///< The window in front of us in z-order. Window *z_back; ///< The window behind us in z-order. @@ -875,7 +877,6 @@ enum WindowFlags { WF_DRAGGING = 1 << 3, ///< Window is being dragged WF_SCROLL_UP = 1 << 4, ///< Upper scroll button has been pressed, @see ScrollbarClickHandler() WF_SCROLL_DOWN = 1 << 5, ///< Lower scroll button has been pressed, @see ScrollbarClickHandler() - WF_SCROLL_MIDDLE = 1 << 6, ///< Scrollbar scrolling, @see ScrollbarClickHandler() WF_SCROLL2 = 1 << 7, WF_HSCROLL = 1 << 8, WF_SIZING_RIGHT = 1 << 9, ///< Window is being resized towards the right. @@ -933,7 +934,6 @@ extern int _scrollbar_start_pos; extern int _scrollbar_size; extern byte _scroller_click_timeout; -extern bool _scrolling_scrollbar; extern bool _scrolling_viewport; extern bool _mouse_hovering; @@ -951,6 +951,6 @@ Window *GetCallbackWnd(); void SetFocusedWindow(Window *w); bool EditBoxInGlobalFocus(); -void ScrollbarClickHandler(Window *w, const NWidgetCore *nw, int x, int y); +void ScrollbarClickHandler(Window *w, NWidgetCore *nw, int x, int y); #endif /* WINDOW_GUI_H */ |