From 663c73595f1c1ed44b23275410347c37abee4657 Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 22 Mar 2009 13:17:37 +0000 Subject: (svn r15810) -Fix: Airport-type labels overlapped with first button, background did not cover whole window --- src/airport_gui.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index fdd02f60e..c4fc7f218 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -292,30 +292,30 @@ static const Widget _build_airport_picker_widgets[] = { { WWT_CAPTION, RESIZE_NONE, COLOUR_DARK_GREEN, 11, 147, 0, 13, STR_3001_AIRPORT_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS}, // BAW_CAPTION { WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 14, 52, 0x0, STR_NULL}, // BAW_SMALL_AIRPORTS_PANEL { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 14, 27, STR_SMALL_AIRPORTS, STR_NULL}, // BAW_SMALL_AIRPORTS_LABEL -{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 53, 89, 0x0, STR_NULL}, // BAW_LARGE_AIRPORTS_PANEL -{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 52, 65, STR_LARGE_AIRPORTS, STR_NULL}, // BAW_LARGE_AIRPORTS_LABEL -{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 90, 127, 0x0, STR_NULL}, // BAW_HUB_AIRPORTS_PANEL -{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 90, 103, STR_HUB_AIRPORTS, STR_NULL}, // BAW_HUB_AIRPORTS_LABEL -{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 128, 177, 0x0, STR_NULL}, // BAW_HELIPORTS_PANEL -{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 128, 141, STR_HELIPORTS, STR_NULL}, // BAW_HELIPORTS_LABEL -{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 178, 239, 0x0, STR_NULL}, // BAW_BOTTOMPANEL -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 27, 38, STR_SMALL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_SMALL_AIRPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 65, 76, STR_CITY_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_CITY_AIRPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 141, 152, STR_HELIPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELIPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 77, 88, STR_METRO_AIRPORT , STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_METRO_AIRPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 103, 114, STR_INTERNATIONAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_INTERNATIONAL_AIRPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 39, 50, STR_COMMUTER_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_COMMUTER_AIRPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 165, 176, STR_HELIDEPOT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELIDEPOT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 115, 126, STR_INTERCONTINENTAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_INTERCONTINENTAL_AIRPORT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 153, 164, STR_HELISTATION, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELISTATION -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 14, 73, 191, 202, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BAW_BTN_DONTHILIGHT -{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 74, 133, 191, 202, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA}, // BAW_BTN_DOHILIGHT -{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 178, 191, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL}, // BAW_COVERAGE_LABEL +{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 53, 91, 0x0, STR_NULL}, // BAW_LARGE_AIRPORTS_PANEL +{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 53, 66, STR_LARGE_AIRPORTS, STR_NULL}, // BAW_LARGE_AIRPORTS_LABEL +{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 92, 130, 0x0, STR_NULL}, // BAW_HUB_AIRPORTS_PANEL +{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 92, 105, STR_HUB_AIRPORTS, STR_NULL}, // BAW_HUB_AIRPORTS_LABEL +{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 131, 181, 0x0, STR_NULL}, // BAW_HELIPORTS_PANEL +{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 131, 144, STR_HELIPORTS, STR_NULL}, // BAW_HELIPORTS_LABEL +{ WWT_PANEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 182, 244, 0x0, STR_NULL}, // BAW_BOTTOMPANEL +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 28, 39, STR_SMALL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_SMALL_AIRPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 67, 78, STR_CITY_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_CITY_AIRPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 145, 156, STR_HELIPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELIPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 79, 90, STR_METRO_AIRPORT , STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_METRO_AIRPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 106, 117, STR_INTERNATIONAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_INTERNATIONAL_AIRPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 40, 51, STR_COMMUTER_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_COMMUTER_AIRPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 169, 180, STR_HELIDEPOT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELIDEPOT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 118, 129, STR_INTERCONTINENTAL_AIRPORT, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_INTERCONTINENTAL_AIRPORT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 145, 157, 168, STR_HELISTATION, STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT}, // BAW_HELISTATION +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 14, 73, 196, 207, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BAW_BTN_DONTHILIGHT +{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 74, 133, 196, 207, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA}, // BAW_BTN_DOHILIGHT +{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 182, 195, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL}, // BAW_COVERAGE_LABEL { WIDGETS_END}, }; static const WindowDesc _build_airport_desc( - WDP_AUTO, WDP_AUTO, 148, 240, 148, 240, + WDP_AUTO, WDP_AUTO, 148, 245, 148, 245, WC_BUILD_STATION, WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_CONSTRUCTION, _build_airport_picker_widgets -- cgit v1.2.3-54-g00ecf