From 103766d511c5098a89e39f84776b65b0f9eeeb53 Mon Sep 17 00:00:00 2001 From: BlockMen Date: Sat, 2 Nov 2013 04:26:44 +0100 Subject: [PATCH] Reworked formspecs and kahrl's hexcolor parser --- builtin/mm_menubar.lua | 4 ++-- builtin/modstore.lua | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/mm_menubar.lua b/builtin/mm_menubar.lua index c3ddbb2..a60ea7a 100644 --- a/builtin/mm_menubar.lua +++ b/builtin/mm_menubar.lua @@ -30,8 +30,8 @@ end -------------------------------------------------------------------------------- function menubar.refresh() - menubar.formspec = "box[-0.3,5.625;12.4,1.3;000000]" .. - "box[-0.3,5.6;12.4,0.05;FFFFFF]" + menubar.formspec = "box[-0.3,5.625;12.4,1.3;#000000]" .. + "box[-0.3,5.6;12.4,0.05;#FFFFFF]" menubar.buttons = {} local button_base = -0.25 diff --git a/builtin/modstore.lua b/builtin/modstore.lua index 43f7759..b364ce6 100644 --- a/builtin/modstore.lua +++ b/builtin/modstore.lua @@ -183,9 +183,9 @@ function modstore.getmodlist(list) retval = retval .. "label[10,-0.4;" .. fgettext("Page $1 of $2", list.page+1, list.pagecount) .. "]" retval = retval .. "button[11.6,-0.1;0.5,0.5;btn_modstore_page_up;^]" - retval = retval .. "box[11.6,0.35;0.28,8.6;000000]" + retval = retval .. "box[11.6,0.35;0.28,8.6;#000000]" local scrollbarpos = 0.35 + (8.1/(list.pagecount-1)) * list.page - retval = retval .. "box[11.6," ..scrollbarpos .. ";0.28,0.5;32CD32]" + retval = retval .. "box[11.6," ..scrollbarpos .. ";0.28,0.5;#32CD32]" retval = retval .. "button[11.6,9.0;0.5,0.5;btn_modstore_page_down;v]" @@ -206,7 +206,7 @@ function modstore.getmodlist(list) if details ~= nil then local screenshot_ypos = (i-1 - (list.page * modstore.modsperpage))*1.9 +0.2 - retval = retval .. "box[0," .. screenshot_ypos .. ";11.4,1.75;FFFFFF]" + retval = retval .. "box[0," .. screenshot_ypos .. ";11.4,1.75;#FFFFFF]" --screenshot if details.screenshot_url ~= nil and