dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24697) -Codechange: Use WDF_UNCLICK_BUTTONS instead of duplicating the same functionality.

Browse Source
This commit is contained in:
frosch
2012-11-11 16:07:46 +00:00
parent cfccaff645
commit b998cbdff1
5 changed files with 12 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/terraform_gui.cpp
View File

@@ -197,8 +197,6 @@ struct TerraformToolbarWindow : Window {
break;
case WID_TT_PLANT_TREES: // Plant trees button
/* This button is NOT a place-push-button, so don't treat it as such */
this->HandleButtonClick(WID_TT_PLANT_TREES);
ShowBuildTreesToolbar();
break;
@@ -220,12 +218,6 @@ struct TerraformToolbarWindow : Window {
}
}
virtual void OnTimeout()
{
this->RaiseWidget(WID_TT_PLANT_TREES);
this->SetWidgetDirty(WID_TT_PLANT_TREES);
}
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
int num = CheckHotkeyMatch(terraform_hotkeys, keycode, this);
@@ -338,7 +330,7 @@ static const NWidgetPart _nested_terraform_widgets[] = {
SetFill(0, 1), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_BUY_LAND), SetMinimalSize(22, 22),
SetFill(0, 1), SetDataTip(SPR_IMG_BUY_LAND, STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND),
NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_PLANT_TREES), SetMinimalSize(22, 22),
NWidget(WWT_PUSHIMGBTN, COLOUR_DARK_GREEN, WID_TT_PLANT_TREES), SetMinimalSize(22, 22),
SetFill(0, 1), SetDataTip(SPR_IMG_PLANTTREES, STR_SCENEDIT_TOOLBAR_PLANT_TREES),
NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, WID_TT_PLACE_SIGN), SetMinimalSize(22, 22),
SetFill(0, 1), SetDataTip(SPR_IMG_SIGN, STR_SCENEDIT_TOOLBAR_PLACE_SIGN),
@@ -352,7 +344,7 @@ static const NWidgetPart _nested_terraform_widgets[] = {
static const WindowDesc _terraform_desc(
WDP_MANUAL, 0, 0,
WC_SCEN_LAND_GEN, WC_NONE,
WDF_CONSTRUCTION,
WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
_nested_terraform_widgets, lengthof(_nested_terraform_widgets)
);