fix: load right menus from gui package
This commit is contained in:
parent
fff87e8ebb
commit
2974d94df4
7 changed files with 16 additions and 16 deletions
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
@ -8,5 +8,8 @@
|
|||
"core",
|
||||
"scenes",
|
||||
"game"
|
||||
],
|
||||
"Lua.diagnostics.disable": [
|
||||
"redundant-parameter"
|
||||
]
|
||||
}
|
||||
|
|
|
@ -24,10 +24,10 @@
|
|||
local Scene = require "birb.modules.scenes"
|
||||
local TestScene = Scene:extend()
|
||||
|
||||
local MenuType = require "birb.modules.menusystem.menus.listbox"
|
||||
local MenuType2 = require "birb.modules.menusystem.menus.flowbox"
|
||||
local MenuType3 = require "birb.modules.menusystem.menus.grid"
|
||||
local Widget = require "birb.modules.menusystem.menus.widgets"
|
||||
local MenuType = require "birb.modules.gui.menus.listbox"
|
||||
local MenuType2 = require "birb.modules.gui.menus.flowbox"
|
||||
local MenuType3 = require "birb.modules.gui.menus.grid"
|
||||
local Widget = require "birb.modules.gui.menus.widgets"
|
||||
|
||||
local MenuWidget = Widget.Text:extend()
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
local ListMenu = require "birb.modules.menusystem.menus.listbox"
|
||||
local Widget = require "birb.modules.menusystem.menus.widgets"
|
||||
local ListMenu = require "birb.modules.gui.menus.listbox"
|
||||
local Widget = require "birb.modules.gui.menus.widgets"
|
||||
|
||||
local PauseMenu = ListMenu:extend()
|
||||
|
||||
|
|
|
@ -24,10 +24,7 @@
|
|||
local Scene = require "birb.modules.scenes"
|
||||
local MainMenu = Scene:extend()
|
||||
|
||||
local ListBox = require "birb.modules.menusystem.menus.listbox"
|
||||
local Widget = require "birb.modules.menusystem.menus.widgets"
|
||||
|
||||
local TextMenu = require "birb.modules.menusystem.textmenu"
|
||||
local TextMenu = require "birb.modules.gui.textmenu"
|
||||
|
||||
local SceneWidget = TextMenu.baseWidgets.Base:extend()
|
||||
local ExitWidget = TextMenu.baseWidgets.Base:extend()
|
||||
|
|
|
@ -24,9 +24,9 @@
|
|||
local Scene = require "birb.modules.scenes"
|
||||
local Inventory = Scene:extend()
|
||||
|
||||
local HListBox = require "birb.modules.menusystem.menus.hlistbox"
|
||||
local FloxBox = require "birb.modules.menusystem.menus.flowbox"
|
||||
local Widget = require "birb.modules.menusystem.menus.widgets"
|
||||
local HListBox = require "birb.modules.gui.menus.hlistbox"
|
||||
local FloxBox = require "birb.modules.gui.menus.flowbox"
|
||||
local Widget = require "birb.modules.gui.menus.widgets"
|
||||
|
||||
local InventoryWidget = Widget.Text:extend()
|
||||
local ItemWidget = Widget.Text:extend()
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
local TextMenu = require "birb.modules.menusystem.textmenu"
|
||||
local TextMenu = require "birb.modules.gui.textmenu"
|
||||
local OptionMenu = TextMenu:extend()
|
||||
|
||||
local consts = require "examples.scenes.menus.options.consts"
|
||||
local consts = require "scenes.menus.options.consts"
|
||||
|
||||
function OptionMenu:new(font)
|
||||
local screenWidth, _ = core.screen:getDimensions()
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
local widgets = {}
|
||||
|
||||
local Widget = require "birb.modules.menusystem.textmenu.widgets.basic"
|
||||
local Widget = require "birb.modules.gui.textmenu.widgets.basic"
|
||||
local DoubleTextWidget = Widget:extend()
|
||||
|
||||
widgets.SubMenu = DoubleTextWidget:extend()
|
||||
|
|
Loading…
Reference in a new issue