Merge pull request #563 from NicholasLN/main

final frame touches before next build
schombert · Oct 21, 2023 · 7a7ab37 · 7a7ab37
2 parents 5808357 + a587a43
commit 7a7ab37
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/assets/alice.gui b/assets/alice.gui
@@ -1090,7 +1090,7 @@ guiTypes = {
 		}
 		windowType = {
 			name = "small_top_right_unit_icon"
-			position = { x = 1 y = -10 }
+			position = { x = 0 y = -10 }
 			size = { x= 60 y = 19 }
 			moveable = 0
 			Orientation = "UPPER_LEFT"

diff --git a/assets/unitleftedges.png b/assets/unitleftedges.png
diff --git a/assets/unitrightedge.png b/assets/unitrightedge.png
diff --git a/src/gui/gui_map_icons.hpp b/src/gui/gui_map_icons.hpp
@@ -433,7 +433,7 @@ class map_battle : public window_element_base {
 		if(state.map_state.get_zoom() >= big_counter_cutoff)
 			window_element_base::impl_render(state, x, y);
 		else
-			window_element_base::impl_render(state, x, y - 23);
+			window_element_base::impl_render(state, x, y - 22);
 	}
 };
 
@@ -604,7 +604,6 @@ class small_top_right_unit_icon : public window_element_base {
 	}
 };
 
-
 class tl_edge : public image_element_base {
 public:
 	int32_t number = 0;
@@ -1159,7 +1158,7 @@ class unit_counter_window : public window_element_base {
 			siege->set_visible(state, false);
 			top_icon->base_data.position.x = -68;
 			top_right_icon->set_visible(state, true);
-			small_top_icon->base_data.position.x = -62;
+			small_top_icon->base_data.position.x = -78;
 			small_top_right_icon->set_visible(state, true);
 		}
 		else if(nbattle) {
@@ -1247,7 +1246,7 @@ class unit_counter_window : public window_element_base {
 			siege->set_visible(state, false);
 			top_icon->base_data.position.x = -68;
 			top_right_icon->set_visible(state, true);
-			small_top_icon->base_data.position.x = -62;
+			small_top_icon->base_data.position.x = -78;
 			small_top_right_icon->set_visible(state, true);
 		}
 		else if(prov.index() < state.province_definitions.first_sea_province.index()) {
@@ -1561,7 +1560,6 @@ class unit_counter_window : public window_element_base {
 	}
 };
 
-
 class map_pv_rail_dots : public image_element_base {
 public:
 	void on_update(sys::state& state) noexcept override {