mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r13006) -Codechange: GetMenuItemIndex is only used for the toolbar, so move it to there.
This commit is contained in:
parent
23fc96c3e8
commit
9ed36409c5
|
@ -77,6 +77,26 @@ static Point GetToolbarDropdownPos(uint16 parent_button, int width, int height)
|
|||
return pos;
|
||||
}
|
||||
|
||||
/**
|
||||
* In a window with menu_d custom extension, retrieve the menu item number from a position
|
||||
* @param w Window holding the menu items
|
||||
* @param x X coordinate of the position
|
||||
* @param y Y coordinate of the position
|
||||
* @return Index number of the menu item, or \c -1 if no valid selection under position
|
||||
*/
|
||||
static int GetMenuItemIndex(const Window *w, int x, int y)
|
||||
{
|
||||
if ((x -= w->left) >= 0 && x < w->width && (y -= w->top + 1) >= 0) {
|
||||
y /= 10;
|
||||
|
||||
if (y < WP(w, const menu_d).item_count &&
|
||||
!HasBit(WP(w, const menu_d).disabled_items, y)) {
|
||||
return y;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* --- Pausing --- */
|
||||
|
||||
static void ToolbarPauseClick(Window *w)
|
||||
|
|
|
@ -2009,27 +2009,6 @@ void UpdateWindows()
|
|||
DrawMouseCursor();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* In a window with menu_d custom extension, retrieve the menu item number from a position
|
||||
* @param w Window holding the menu items
|
||||
* @param x X coordinate of the position
|
||||
* @param y Y coordinate of the position
|
||||
* @return Index number of the menu item, or \c -1 if no valid selection under position
|
||||
*/
|
||||
int GetMenuItemIndex(const Window *w, int x, int y)
|
||||
{
|
||||
if ((x -= w->left) >= 0 && x < w->width && (y -= w->top + 1) >= 0) {
|
||||
y /= 10;
|
||||
|
||||
if (y < WP(w, const menu_d).item_count &&
|
||||
!HasBit(WP(w, const menu_d).disabled_items, y)) {
|
||||
return y;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark window as dirty (in need of repainting)
|
||||
* @param cls Window class
|
||||
|
|
|
@ -577,7 +577,6 @@ Wcls *AllocateWindowDescFront(const WindowDesc *desc, int window_number, void *d
|
|||
|
||||
void DrawWindowViewport(const Window *w);
|
||||
|
||||
int GetMenuItemIndex(const Window *w, int x, int y);
|
||||
void RelocateAllWindows(int neww, int newh);
|
||||
|
||||
/* misc_gui.cpp */
|
||||
|
|
Loading…
Reference in New Issue