From 840c1b0105ac573523807c8043b0201136ae39cc Mon Sep 17 00:00:00 2001 From: Hugues Ross Date: Sun, 19 Apr 2020 09:33:24 -0400 Subject: [PATCH] Split table background in two to handle different UI sizes better --- skin_api.lua | 12 ++++++++++++ table.lua | 7 ++++--- textures/cartographer_advanced_table_bg.png | Bin 1089 -> 1073 bytes textures/cartographer_advanced_table_bg_2.png | Bin 0 -> 1016 bytes textures/cartographer_simple_table_bg.png | Bin 1170 -> 1151 bytes textures/cartographer_simple_table_bg_2.png | Bin 0 -> 988 bytes textures/cartographer_standard_table_bg.png | Bin 1111 -> 1083 bytes textures/cartographer_standard_table_bg_2.png | Bin 0 -> 990 bytes 8 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 textures/cartographer_advanced_table_bg_2.png create mode 100644 textures/cartographer_simple_table_bg_2.png create mode 100644 textures/cartographer_standard_table_bg_2.png diff --git a/skin_api.lua b/skin_api.lua index 2adb5b0..22c4feb 100644 --- a/skin_api.lua +++ b/skin_api.lua @@ -35,6 +35,10 @@ cartographer.skin = { texture = "cartographer_simple_table_bg", radius = 16, }, + inner_background = { + texture = "cartographer_simple_table_bg_2", + radius = 4, + }, button = { font_color = "#694a3a", texture = "cartographer_simple_table_button", @@ -74,6 +78,10 @@ cartographer.skin = { texture = "cartographer_standard_table_bg", radius = 16, }, + inner_background = { + texture = "cartographer_standard_table_bg_2", + radius = 4, + }, button = { font_color = "#694a3a", texture = "cartographer_simple_table_button", @@ -113,6 +121,10 @@ cartographer.skin = { texture = "cartographer_advanced_table_bg", radius = 16, }, + inner_background = { + texture = "cartographer_advanced_table_bg_2", + radius = 2, + }, button = { font_color = "#1f2533", texture = "cartographer_advanced_table_button", diff --git a/table.lua b/table.lua index 1f9262e..2c8fab4 100644 --- a/table.lua +++ b/table.lua @@ -84,13 +84,14 @@ function fs.header(w, h, rank, tab, skin) local data = "formspec_version[3]" .. string.format("size[%f,%f]", w, h) .. string.format("background9[-0.1,0;1,1;%s.png;true;%s]", skin.background.texture, tostring(skin.background.radius)) + .. string.format("background9[0.0625,0.125;%f,%f;%s.png;false;%s]", w - 0.125, h - 0.25, skin.inner_background.texture, tostring(skin.inner_background.radius)) .. string.format("style_type[button;noclip=true;border=false;bgimg=%s.png;bgimg_hovered=%s.png;bgimg_pressed=%s.png;bgimg_middle=%s;textcolor=%s]", skin.tab.texture, skin.tab.hovered_texture, skin.tab.pressed_texture, tostring(skin.tab.radius), skin.tab.font_color) .. string.format("style[tab%d;noclip=true;border=false;bgimg=%s.png;bgimg_hovered=%s.png;bgimg_pressed=%s.png;bgimg_middle=%s;textcolor=%s]", tab, skin.tab.selected_texture, skin.tab.selected_texture, skin.tab.selected_texture, tostring(skin.tab.radius), skin.tab.font_color) - .. string.format("button[0.25,-0.375;1.5,0.55;tab1;Materials]", tab) - .. string.format("button[1.75,-0.375;1.5,0.55;tab2;Create Map]", tab); + .. string.format("button[0.25,-0.425;1.5,0.55;tab1;Materials]", tab) + .. string.format("button[1.75,-0.425;1.5,0.55;tab2;Create Map]", tab); if rank >= 2 then - data = data .. string.format("button[3.25,-0.375;1.5,0.55;tab3;Copy Map]", tab); + data = data .. string.format("button[3.25,-0.425;1.5,0.55;tab3;Copy Map]", tab); end return data .. string.format("style_type[button;border=false;bgimg=%s.png;bgimg_hovered=%s.png;bgimg_pressed=%s.png;bgimg_middle=%s;textcolor=%s]", skin.button.texture, skin.button.hovered_texture, skin.button.pressed_texture, tostring(skin.button.radius), skin.button.font_color); diff --git a/textures/cartographer_advanced_table_bg.png b/textures/cartographer_advanced_table_bg.png index 7e1a283f9b82e61b631e785077b850b70bfe9578..53105071c3cd117dc7895eb1220e0a2d95bd638b 100644 GIT binary patch delta 109 zcmV-z0FwW~2(bvT%mZamNklpRR-pgk1vh?~8$Y$UuQxG2p)gAAIl#q<>QPY+Coji2)^uL^l5krkEmm96EKQ P00000NkvXXu0mjf+Q=<2 delta 125 zcmV-@0D}Lq2*C)j%mZ~`NklLQHh!+wv0@ zFlbCQaJM67ow5h1#X#fx)r0MZ2ZE4z5T66z2c^0a2KC|(k^tf!zQwD-^iSHzr?ozu fJfJ2>%;tXrgrg+cY9Z&`00000NkvXXu0mjfJ&rlY diff --git a/textures/cartographer_advanced_table_bg_2.png b/textures/cartographer_advanced_table_bg_2.png new file mode 100644 index 0000000000000000000000000000000000000000..870fdbb5830fa66239b68ba0481075f32ee0d317 GIT binary patch literal 1016 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xMh6z|0Wf6XH5K*R?s!uG-x?)644k z+{zP&HUbsk0qUC0_O`*v#l7u|*DgJJ7>~+PsnHM^v>}k2o4ab&s{jB0_gda-1-eqP zB*-rq$i)j7<{!ME2vp2p;u=vBoS#-wo>-L1;9iuNR$;VYQE(Pe$|JeRFC9oT8Q6nJ z2Y(P55Dy{~@tjuC;VHyg(2M=(t@i6FUFv`BxIx2@A-J zK*|toDy{}_w3pAYRmd3y1c^;Vh{Hyt{!)9W0t``pzE-X9U;}Um%C1nN0}Rm~BDpJ^ zkov6$5!U_@ZW*A@-R1`*fF$#rfLI=~G59M3Y@El@X=@@@g;+y>X0i&!L3$!JrYqI= z{XJ4!qOuk|QOP&<3bq&R&TT0U#`Yr9SiNV!gKxk3pMG{X5uubGQ?LL4002ovPDHLk FV1h^=Spfh5 delta 222 zcmV<403rYX2$Bh~y#s&1Nkl7mrvj-+!+BF6RA={95!O=htfl3Ac(U6Yn2KwHUM=Xdxa7mAc*!*;B|mLR=^3x;BT|Rl8efdReV) zj@&!55U2nTkXJRvBReWJ8UjNi1afn8SFKw0|NsAh89`HlF6J+BjVKAuPb(=;EJ|f? zFG@_SFj}xEI14D{kzC}L4y2h3>_Mc1KZp#72ayT+AhMtyL^kw;$O-d7ITQ zdEh*Vyl@{xK6t-t*1Oq2mWHQ`V~E7mZ0VeoYIb6Mw<&;$Tj1wiBg literal 0 HcmV?d00001 diff --git a/textures/cartographer_standard_table_bg.png b/textures/cartographer_standard_table_bg.png index 0a4bbc51463a178119ec1514f8fbb6d2f21ce71b..d5f5cf3893c40d0c269ec54851e2122dc602aa64 100644 GIT binary patch delta 119 zcmV--0EqwB2)hWd%mZ&)Nkl!S!@hW z8Q{~d7@H_hA*Cs(gs2P01{Vk+le!?$&UZ7Xy%7n6$w&K(34<{Ey6NFLC Z{|30pBlxQ*x7Gjv002ovPDHLkV1gDVGnfDX delta 148 zcmV;F0Bird2-gU(%maURNkl*SNH^IHhdPk}iFODq~HYgdq`tN`5CQGw)J_-x~0000B|mLR=^3x;BT|Rl8efdReV) zj@&!55U2nTkXJRvBReWJ8UjNi1afn8SFKw0|NsAh89`HlF6J+BjVKAuPb(=;EJ|f? zFG@_SFj}xEI14D{kzC}L4y2h3>_Mc1KZp#72ayT+AhMtyL^kw;$O-d7ITQ zdEh*Vyl@{xK6t-t*1Oq2mX@cBV~E7m