ui: window empire mouse handle moved to class

Author: dalerank

src/graphics/elements/ui.cpp

@@ -544,6 +544,7 @@ void ui::element::load(archive arch, element *parent, element::items &items) {
         margin.left = m.r_int("left", recti::nomargin);
         margin.right = m.r_int("right", recti::nomargin);
         margin.top = m.r_int("top", recti::nomargin);
+        margin.centerx = m.r_int("centerx", recti::nomargin);
     });
 
     load_elements(arch, "ui", this, items);
@@ -558,6 +559,7 @@ void ui::element::update_pos(const recti &r) {
     if (margin.bottom > recti::nomargin) { pos.y = r.bottom + margin.bottom; }
     if (margin.right > recti::nomargin) { pos.x = r.right + margin.right; }
     if (margin.top > recti::nomargin) { pos.y = r.top + margin.top; }
+    if (margin.centerx > recti::nomargin) { pos.x = (r.right - r.left) / 2 + margin.centerx; }
 }
 
 vec2i ui::element::screen_pos() const {

src/graphics/elements/ui.h

@@ -96,6 +96,7 @@ struct recti {
     int top = 0;
     int right = 0;
     int bottom = 0;
+    int centerx = 0;
 };
 
 struct element {
@@ -105,7 +106,7 @@ struct element {
     xstring id;
     vec2i pos;
     vec2i size;
-    recti margin = { recti::nomargin, recti::nomargin, recti::nomargin, recti::nomargin };
+    recti margin = { recti::nomargin, recti::nomargin, recti::nomargin, recti::nomargin, recti::nomargin };
     bool readonly = false;
     bool enabled = true;
     bool grayed = false;

src/scripts/ui.js

@@ -1398,7 +1398,6 @@ empire_window = {
 	info_y_sells : 30,
 	info_y_buys : 52,
 	info_y_footer_1 : 78,
-	info_y_city_name : 120,
 	info_y_city_desc : 28,
 	text_group_old_names : 195,
 	text_group_new_names : 21,
@@ -1415,8 +1414,9 @@ empire_window = {
 	cross_bar : {pack:PACK_GENERAL, id:172, offset:2},
 
 	ui : {
-
-
+		background : dummy({size:[sw(0), sh(0)]}),
+		city_name : header({pos:[0, -1], margin:{bottom:-120}, size:[sw(0), 20], align:"center"}),
+		button_help : help_button({margin:{centerx:575, bottom:-120}}),
 	}
 }