erle
/
mainmenu_csm
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reworked formspecs and kahrl's hexcolor parser

This commit is contained in:
BlockMen 2013-11-02 04:26:44 +01:00 committed by Nils Dagsson Moskopp
parent a78ef8d3a0
commit 103766d511
Signed by: erle
GPG Key ID: A3BC671C35191080
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mm_menubar.lua
View File

@ -30,8 +30,8 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
function menubar.refresh() function menubar.refresh()
menubar.formspec = "box[-0.3,5.625;12.4,1.3;000000]" .. menubar.formspec = "box[-0.3,5.625;12.4,1.3;#000000]" ..
"box[-0.3,5.6;12.4,0.05;FFFFFF]" "box[-0.3,5.6;12.4,0.05;#FFFFFF]"
menubar.buttons = {} menubar.buttons = {}
local button_base = -0.25 local button_base = -0.25

6
builtin/modstore.lua
View File

@ -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 .. "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 .. "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 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]" 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 if details ~= nil then
local screenshot_ypos = (i-1 - (list.page * modstore.modsperpage))*1.9 +0.2 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 --screenshot
if details.screenshot_url ~= nil and if details.screenshot_url ~= nil and