From baf04a055dbc66b80c29a406907a0a595ac55f00 Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 27 Jun 2017 09:02:03 +0200 Subject: Moved ui elements to use new oop lib --- config/menus/host.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'config/menus/host.lua') diff --git a/config/menus/host.lua b/config/menus/host.lua index b318a5b..fff683c 100644 --- a/config/menus/host.lua +++ b/config/menus/host.lua @@ -1,18 +1,18 @@ local menu = ... -local button = require "not.Button" -local selector = require "not.Selector" +local Button = require "not.Button" +local Selector = require "not.Selector" local width, height = love.graphics.getWidth()/getScale(), love.graphics.getHeight()/getScale() local bx = width/2-29 -local map_selector = selector:new(menu) +local map_Selector = Selector(menu) require "iconsList" local icons, maps = getMapsIconsList() return { - map_selector + map_Selector :setPosition(width/2, 40) :setSize(80, 42) :setMargin(0) @@ -24,18 +24,18 @@ return { :set("shape", "panorama") :init() , - button:new(menu) + Button(menu) :setText("Next") :setPosition(bx,101) :set("isEnabled", function () - return map_selector:isLocked() + return map_Selector:isLocked() end) :set("active", function (self) - MAP = map_selector:getFullSelection(true)[1][1] -- please, don't kill me for this, kek + MAP = map_Selector:getFullSelection(true)[1][1] -- please, don't kill me for this, kek self.parent:open("select") end) , - button:new(menu) + Button(menu) :setText("Go back") :setPosition(bx,117) :set("active", function (self) -- cgit v1.1 From 96fef88f56fdcdf95bc5783eb2b3b881ff435ba0 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 14 Jul 2017 21:54:46 +0200 Subject: Background in menu moved to separate class Weird noise added to menu configs to use single MenuBackground instance Initial pause menu added --- config/menus/host.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'config/menus/host.lua') diff --git a/config/menus/host.lua b/config/menus/host.lua index fff683c..a180736 100644 --- a/config/menus/host.lua +++ b/config/menus/host.lua @@ -1,4 +1,4 @@ -local menu = ... +local menu, background = ... local Button = require "not.Button" local Selector = require "not.Selector" @@ -11,7 +11,12 @@ local map_Selector = Selector(menu) require "iconsList" local icons, maps = getMapsIconsList() +if background == nil or not background:is(require "not.MenuBackground") then + background = require "not.MenuBackground"(menu) +end + return { + background, map_Selector :setPosition(width/2, 40) :setSize(80, 42) @@ -42,4 +47,4 @@ return { self.parent:open("main") end) , -} \ No newline at end of file +} -- cgit v1.1