ui: offset for resolution list moved to config

Author: dalerank

src/graphics/elements/scroll_list_panel.cpp

@@ -195,7 +195,7 @@ int scroll_list_panel::input_handle(const mouse* m) {
 
 void scroll_list_panel::draw() {
     if (ui_params.draw_paneling) {
-        inner_panel_draw(ui_params.x, ui_params.y, ui_params.blocks_x, ui_params.blocks_y);
+        inner_panel_draw(ui_params.pos.x, ui_params.pos.y, ui_params.blocks_x, ui_params.blocks_y);
     }
 
     bstring256 text_utf8;
@@ -207,8 +207,8 @@ void scroll_list_panel::draw() {
         else if (focus_button_id == i + 1)
             font = ui_params.font_focus;
 
-        int button_pos_x = ui_params.x + ui_params.buttons_margin_x;
-        int button_pos_y = ui_params.y + ui_params.buttons_size_y * i + ui_params.buttons_margin_y;
+        int button_pos_x = ui_params.pos.x + ui_params.buttons_margin_x;
+        int button_pos_y = ui_params.pos.y + ui_params.buttons_size_y * i + ui_params.buttons_margin_y;
         int text_pos_x = button_pos_x + ui_params.text_padding_x;
         int text_pos_y = button_pos_y + ui_params.text_padding_y;
 
@@ -233,7 +233,7 @@ void scroll_list_panel::draw() {
             text_draw(text, text_pos_x, text_pos_y, font, 0);
         }
     }
-    scrollbar_draw({ui_params.x, ui_params.y}, &scrollbar);
+    scrollbar_draw(ui_params.pos, &scrollbar);
     WAS_DRAWN = true;
 }
 
@@ -262,8 +262,8 @@ scroll_list_panel::scroll_list_panel(int n_buttons,
     double_click_callback = dmb;
     focus_change_callback = fcc;
     for (int i = 0; i < num_buttons; ++i) {
-        int button_pos_x = ui_params.x + ui_params.buttons_margin_x;
-        int button_pos_y = ui_params.y + ui_params.buttons_size_y * i + ui_params.buttons_margin_y;
+        int button_pos_x = ui_params.pos.x + ui_params.buttons_margin_x;
+        int button_pos_y = ui_params.pos.y + ui_params.buttons_size_y * i + ui_params.buttons_margin_y;
         list_buttons[i].x = button_pos_x;
         list_buttons[i].y = button_pos_y;
         list_buttons[i].width = ui_params.buttons_size_x;
@@ -275,8 +275,8 @@ scroll_list_panel::scroll_list_panel(int n_buttons,
     }
 
     // init scrollbar
-    scrollbar.pos.x = ui_params.x + DEFAULT_BLOCK_SIZE * ui_params.blocks_x + ui_params.scrollbar_margin_x;
-    scrollbar.pos.y = ui_params.y + ui_params.scrollbar_margin_top;
+    scrollbar.pos.x = ui_params.pos.x + DEFAULT_BLOCK_SIZE * ui_params.blocks_x + ui_params.scrollbar_margin_x;
+    scrollbar.pos.y = ui_params.pos.y + ui_params.scrollbar_margin_top;
     scrollbar.height = DEFAULT_BLOCK_SIZE * ui_params.blocks_y - ui_params.scrollbar_margin_bottom;
     scrollbar.thin = ui_params.thin_scrollbar;
     scrollbar.always_visible = ui_params.draw_scrollbar_always;

src/graphics/elements/scroll_list_panel.h

@@ -10,8 +10,7 @@
 #define MAX_MANUAL_ENTRIES 300
 
 struct scrollable_list_ui_params {
-    int x = 0;
-    int y = 0;
+    vec2i pos = { 0, 0 };
     int blocks_x = 10;
     int blocks_y = 10;
     int buttons_size_x = -1; // default: defined by paneling

src/scripts/ui.js

@@ -700,6 +700,8 @@ display_options_window = {
 		btnfullscreen : button({pos:[16, 46], size:[224, 20] }),
 		videodriver : text({pos:[px(24)/2 + 60, 50]}),
 
+		resolutions : dummy({pos:[16, 70]}),
+
 		save_changes: text({margin:{left:px(24)/2 - 80, bottom:-35}, text:[43, 5]}),
 		btnok 			: ok_button({margin:{left:px(24)/2 + 10, bottom:-40}}), 
 		btncancel 	: cancel_button({margin:{left:px(24)/2 + 60, bottom:-40}}), 

src/window/display_options.cpp

@@ -75,13 +75,11 @@ void ui::display_options_window::init(close_callback close_cb) {
 
 void ui::display_options_window::ui_draw_foreground() {
     ui.begin_widget(pos);
+    
     ui.draw();
-
-    vec2i scrpos = ui["background"].screen_pos();
-    panel->ui_params.x = scrpos.x + 16;
-    panel->ui_params.y = scrpos.y + 70;
-
+    panel->ui_params.pos = ui["resolutions"].screen_pos();
     panel->draw();
+
     ui.end_widget();
 }
 

src/window/file_dialog.cpp

@@ -48,8 +48,7 @@ static image_button image_buttons[] = {
 
 static scrollable_list_ui_params ui_params = [] {
     scrollable_list_ui_params ret;
-    ret.x = 144;
-    ret.y = 120;
+    ret.pos = { 144, 120 };
     ret.blocks_x = 20;
     ret.blocks_y = NUM_FILES_IN_VIEW + 1;
     ret.draw_scrollbar_always = true;

src/window/player_selection.cpp

@@ -54,8 +54,7 @@ static generic_button buttons[] = {
 
 static scrollable_list_ui_params ui_params = [] {
     scrollable_list_ui_params ret;
-    ret.x = 144;
-    ret.y = 92;
+    ret.pos = { 144, 92 };
     ret.blocks_x = 20;
     ret.blocks_y = NUM_FILES_IN_VIEW + 1;
     ret.draw_scrollbar_always = true;

src/window/scenario_selection.cpp

@@ -37,19 +37,13 @@ static image_button start_button = {600, 440, 27, 27, IB_NORMAL, GROUP_BUTTON_EX
 
 #define MAX_SCENARIOS 15
 
-// These braced-init-list style initializations work ONLY in C++14.
-// C++11 allows for EITHER complete braced initialization, or partial
-// braced initialization with NO default member values, since they
-// override the default (implicit) constructor.
 static scrollable_list_ui_params ui_params = [] {
     scrollable_list_ui_params ret;
-    ret.x = 16;
-    ret.y = 210;
+    ret.pos = { 16, 210 };
     ret.blocks_x = 16;
     ret.blocks_y = MAX_SCENARIOS + 1;
     ret.scrollbar_margin_x = 10;
     return ret;
-    //        .draw_scrollbar_always = true
 }();
 
 struct window_scenario_selection_t {