miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make land info work in tooltip mode

Browse Source
This commit is contained in:
Pavel Stupnikov
2015-03-23 21:27:50 +03:00
parent 6200680c55
commit 44ef29dba9
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/misc_gui.cpp
View File

@@ -51,16 +51,11 @@ enum OskActivation {
static const NWidgetPart _nested_land_info_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_DEBUGBOX, COLOUR_GREY),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), SetMinimalSize(64, 32), EndContainer(),
};
static WindowDesc _land_info_desc(
WDP_AUTO, "land_info", 0, 0,
WDP_MANUAL, "land_info", 0, 0,
WC_LAND_INFO, WC_NONE,
0,
_nested_land_info_widgets, lengthof(_nested_land_info_widgets)
@@ -79,6 +74,17 @@ public:
char landinfo_data[LAND_INFO_LINE_END][LAND_INFO_LINE_BUFF_SIZE];
TileIndex tile;
virtual Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number)
{
int scr_top = GetMainViewTop() + 2;
int scr_bot = GetMainViewBottom() - 2;
Point pt;
pt.y = Clamp(_cursor.pos.y + _cursor.size.y + _cursor.offs.y + 5, scr_top, scr_bot);
if (pt.y + sm_height > scr_bot) pt.y = min(_cursor.pos.y + _cursor.offs.y - 5, scr_bot) - sm_height;
pt.x = sm_width >= _screen.width ? 0 : Clamp(_cursor.pos.x - (sm_width >> 1), 0, _screen.width - sm_width);
return pt;
}
virtual void DrawWidget(const Rect &r, int widget) const
{
if (widget != WID_LI_BACKGROUND) return;
@@ -124,6 +130,7 @@ public:
LandInfoWindow(TileIndex tile) : Window(&_land_info_desc), tile(tile)
{
this->InitNested();
CLRBITS(this->flags, WF_WHITE_BORDER);
#if defined(_DEBUG)
# define LANDINFOD_LEVEL 0
@@ -365,6 +372,24 @@ public:
break;
}
}
virtual void OnMouseLoop()
{
/* Always close tooltips when the cursor is not in our window. */
if (!_cursor.in_window) {
delete this;
return;
}
if (!_mouse_hovering) delete this;
/* We can show tooltips while dragging tools. These are shown as long as
* we are dragging the tool. Normal tooltips work with hover or rmb. */
// switch (this->close_cond) {
// case TCC_RIGHT_CLICK: if (!_right_button_down) delete this; break;
// case TCC_LEFT_CLICK: if (!_left_button_down) delete this; break;
// case TCC_HOVER: if (!_mouse_hovering) delete this; break;
// }
}
};
/**
@@ -1231,6 +1256,12 @@ void GuiPrepareTooltipsExtra(Window *parent){
const Point p = GetTileBelowCursor();
const TileIndex tile = TileVirtXY(p.x, p.y);
if (_cursor.sprite == SPR_CURSOR_QUERY) {
// Land info tool active
ShowLandInfo(tile);
return;
}
if (tile >= MapSize()) return;
uint param = 0;
switch (GetTileType(tile)) {