(svn r16203) -Codechange: Simplify widget layout of news settings window.

src/news_gui.cpp

@@ -949,7 +949,7 @@ struct MessageOptionsWindow : Window {
 	   90,  98,  basey     + linenum * NEWS_SETTING_BASELINE_SKIP,  basey + 11 + linenum * NEWS_SETTING_BASELINE_SKIP, \
 	  SPR_ARROW_RIGHT, STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST}, \
         { WWT_TEXT, RESIZE_NONE, COLOUR_YELLOW, \
-	  103, 409,  basey + 1 + linenum * NEWS_SETTING_BASELINE_SKIP,  basey + 13 + linenum * NEWS_SETTING_BASELINE_SKIP, \
+	  103, 409,  basey + linenum * NEWS_SETTING_BASELINE_SKIP,  basey + 11 + linenum * NEWS_SETTING_BASELINE_SKIP, \
 	  _news_type_data[linenum].description, STR_NULL}
 
 static const int NEWS_SETTING_BASELINE_SKIP = 12; ///< Distance between two news-setting lines, should be at least 12
@@ -965,7 +965,7 @@ static const Widget _message_options_widgets[] = {
 
 /* Text at the top of the main panel, in black */
 {    WWT_LABEL, RESIZE_NONE, COLOUR_BROWN,
-	  0, 409, 13, 26,
+	  0, 409, 14, 27,
 	STR_NEWS_MESSAGE_TYPES,   STR_NULL},
 
 /* General drop down and sound button, widgets WIDGET_NEWSOPT_BTN_SUMMARY and WIDGET_NEWSOPT_DROP_SUMMARY */
@@ -974,7 +974,7 @@ static const Widget _message_options_widgets[] = {
 	0x0, STR_NULL},
 
 {      WWT_TEXT, RESIZE_NONE, COLOUR_YELLOW,
-	103, 409,  35 + NT_END * NEWS_SETTING_BASELINE_SKIP,  47 + NT_END * NEWS_SETTING_BASELINE_SKIP,
+	103, 409,  34 + NT_END * NEWS_SETTING_BASELINE_SKIP,  45 + NT_END * NEWS_SETTING_BASELINE_SKIP,
 	STR_MESSAGES_ALL, STR_NULL},
 
 /* Below is widget WIDGET_NEWSOPT_SOUNDTICKER */
@@ -983,27 +983,27 @@ static const Widget _message_options_widgets[] = {
 	STR_STATION_BUILD_COVERAGE_OFF,  STR_NULL},
 
 {      WWT_TEXT, RESIZE_NONE, COLOUR_YELLOW,
-	103, 409,  47 + NT_END * NEWS_SETTING_BASELINE_SKIP,  59 + NT_END * NEWS_SETTING_BASELINE_SKIP,
+	103, 409,  46 + NT_END * NEWS_SETTING_BASELINE_SKIP,  57 + NT_END * NEWS_SETTING_BASELINE_SKIP,
 	STR_MESSAGE_SOUND, STR_NULL},
 
 /* List of news-setting lines (4 widgets for each line).
  * First widget must be number WIDGET_NEWSOPT_START_OPTION
  */
-NEWS_SETTINGS_LINE(26, NT_ARRIVAL_COMPANY),
-NEWS_SETTINGS_LINE(26, NT_ARRIVAL_OTHER),
-NEWS_SETTINGS_LINE(26, NT_ACCIDENT),
-NEWS_SETTINGS_LINE(26, NT_COMPANY_INFO),
-NEWS_SETTINGS_LINE(26, NT_INDUSTRY_OPEN),
-NEWS_SETTINGS_LINE(26, NT_INDUSTRY_CLOSE),
-NEWS_SETTINGS_LINE(26, NT_ECONOMY),
-NEWS_SETTINGS_LINE(26, NT_INDUSTRY_COMPANY),
-NEWS_SETTINGS_LINE(26, NT_INDUSTRY_OTHER),
-NEWS_SETTINGS_LINE(26, NT_INDUSTRY_NOBODY),
-NEWS_SETTINGS_LINE(26, NT_ADVICE),
-NEWS_SETTINGS_LINE(26, NT_NEW_VEHICLES),
-NEWS_SETTINGS_LINE(26, NT_ACCEPTANCE),
-NEWS_SETTINGS_LINE(26, NT_SUBSIDIES),
-NEWS_SETTINGS_LINE(26, NT_GENERAL),
+NEWS_SETTINGS_LINE(28, NT_ARRIVAL_COMPANY),
+NEWS_SETTINGS_LINE(28, NT_ARRIVAL_OTHER),
+NEWS_SETTINGS_LINE(28, NT_ACCIDENT),
+NEWS_SETTINGS_LINE(28, NT_COMPANY_INFO),
+NEWS_SETTINGS_LINE(28, NT_INDUSTRY_OPEN),
+NEWS_SETTINGS_LINE(28, NT_INDUSTRY_CLOSE),
+NEWS_SETTINGS_LINE(28, NT_ECONOMY),
+NEWS_SETTINGS_LINE(28, NT_INDUSTRY_COMPANY),
+NEWS_SETTINGS_LINE(28, NT_INDUSTRY_OTHER),
+NEWS_SETTINGS_LINE(28, NT_INDUSTRY_NOBODY),
+NEWS_SETTINGS_LINE(28, NT_ADVICE),
+NEWS_SETTINGS_LINE(28, NT_NEW_VEHICLES),
+NEWS_SETTINGS_LINE(28, NT_ACCEPTANCE),
+NEWS_SETTINGS_LINE(28, NT_SUBSIDIES),
+NEWS_SETTINGS_LINE(28, NT_GENERAL),
 
 {   WIDGETS_END},
 };