diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_lb.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_lb.png
index f6664f5a75..8697e6c1f0 100644
--- a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_lb.png
+++ b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_lb.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6b0d35e53144cc48f9bffc6f6e933d1dd5169bb804249893203561f1d66b85f5
-size 417
+oid sha256:738a89ea3808be38be50356c7d29dc734a0db625127ff9d707ebc660ccf11b53
+size 426
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb.png
index 8697e6c1f0..f6664f5a75 100644
--- a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb.png
+++ b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:738a89ea3808be38be50356c7d29dc734a0db625127ff9d707ebc660ccf11b53
-size 426
+oid sha256:6b0d35e53144cc48f9bffc6f6e933d1dd5169bb804249893203561f1d66b85f5
+size 417
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb_x2.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb_x2.png
new file mode 100644
index 0000000000..7f89eba6af
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_corner_rb_x2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc2846206a69e5afdc1f16edb5eb3d122a5744b652e1dc2128bdb8ce2146ee1d
+size 478
diff --git a/binaries/data/mods/official/gui/test/7_atlas.xml b/binaries/data/mods/official/gui/test/7_atlas.xml
index 6e76507c07..a730c4bf0b 100644
--- a/binaries/data/mods/official/gui/test/7_atlas.xml
+++ b/binaries/data/mods/official/gui/test/7_atlas.xml
@@ -15,22 +15,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -43,16 +94,10 @@
]]>
-
-
+
+
-
-
-
-
diff --git a/binaries/data/mods/official/gui/test/functions_atlas.js b/binaries/data/mods/official/gui/test/functions_atlas.js
index cbfa6e3105..550f78cba2 100755
--- a/binaries/data/mods/official/gui/test/functions_atlas.js
+++ b/binaries/data/mods/official/gui/test/functions_atlas.js
@@ -25,13 +25,19 @@ function initAtlas()
// Top tool bar.
crd_atlas_mainborder_toolbar_bkg_width = crd_atlas_mainborder_rt_corner_width-crd_atlas_mainborder_lt_corner_width;
- crd_atlas_mainborder_toolbar_bkg_height = 22;
+ crd_atlas_mainborder_toolbar_bkg_height = 20;
crd_atlas_mainborder_toolbar_bkg_x = crd_atlas_mainborder_lt_corner_x;
crd_atlas_mainborder_toolbar_bkg_y = crd_atlas_mainborder_menu_bkg_y+crd_atlas_mainborder_menu_bkg_height;
+ // Left-hand selection pane.
+ crd_atlas_left_pane_bkg_width = 187;
+ crd_atlas_left_pane_bkg_height = crd_atlas_mainborder_toolbar_bkg_y-crd_atlas_mainborder_toolbar_bkg_height;
+ crd_atlas_left_pane_bkg_x = crd_atlas_mainborder_lt_corner_x;
+ crd_atlas_left_pane_bkg_y = crd_atlas_mainborder_toolbar_bkg_y+crd_atlas_mainborder_toolbar_bkg_height;
+
// Bottom-right Mini Map Background.
- crd_atlas_minimap_bkg_width = 180;
- crd_atlas_minimap_bkg_height = 180;
+ crd_atlas_minimap_bkg_width = 182;
+ crd_atlas_minimap_bkg_height = 182;
crd_atlas_minimap_bkg_x = 0;
crd_atlas_minimap_bkg_y = 0;
@@ -40,6 +46,30 @@ function initAtlas()
crd_atlas_minimap_height = 140;
crd_atlas_minimap_x = 20;
crd_atlas_minimap_y = 20;
+
+ // Bottom selection pane.
+ crd_atlas_bottom_pane_bkg_width = crd_atlas_left_pane_bkg_x-crd_atlas_left_pane_bkg_width-crd_atlas_minimap_bkg_x-crd_atlas_minimap_bkg_width+6;
+ crd_atlas_bottom_pane_bkg_height = 148;
+ crd_atlas_bottom_pane_bkg_x = crd_atlas_left_pane_bkg_x+crd_atlas_left_pane_bkg_width-3;
+ crd_atlas_bottom_pane_bkg_y = crd_atlas_left_pane_bkg_height;
+
+ // Left-Bottom selection pane corner.
+ crd_atlas_lb_corner_width = 20;
+ crd_atlas_lb_corner_height = 20;
+ crd_atlas_lb_corner_x = crd_atlas_left_pane_bkg_x+crd_atlas_left_pane_bkg_width-3;
+ crd_atlas_lb_corner_y = crd_atlas_bottom_pane_bkg_height-4;
+
+ // Right-Bottom selection pane corner.
+ crd_atlas_rb_corner_width = (crd_atlas_minimap_bkg_height-crd_atlas_bottom_pane_bkg_height)+3;
+ crd_atlas_rb_corner_height = crd_atlas_rb_corner_width;
+ crd_atlas_rb_corner_x = crd_atlas_minimap_bkg_width-2;
+ crd_atlas_rb_corner_y = crd_atlas_bottom_pane_bkg_height-4;
+
+ // Atlas tooltip window.
+ crd_atlas_tooltip_width = crd_atlas_minimap_bkg_width-20;
+ crd_atlas_tooltip_height = 82;
+ crd_atlas_tooltip_x = crd_atlas_minimap_bkg_x+10;
+ crd_atlas_tooltip_y = crd_atlas_minimap_bkg_y+crd_atlas_minimap_bkg_height+4;
}
// ====================================================================
\ No newline at end of file
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index 2d80b53f50..279132dc7b 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -92,7 +92,7 @@ function startLoadingScreen()
getGUIObjectByName("loading_screen_tip").caption = "Wise man once say ...\nHe who thinks slow, he act in haste, be rash and quick and foolish. But he that thinks too much, acts too slowly. The stupid always win, Commandersan. Remember that. You are tiny grasshopper.";
// Begin game session.
- setTimeout( loadSession, 10 );
+ setTimeout( loadSession, 20 );
}
// ====================================================================
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index c7833e0db9..d9277def5a 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -76,6 +76,12 @@
delay="0"
/>
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -775,47 +804,47 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -824,6 +853,10 @@
+
+
+
+