run on.load_settings after loading defaults
This commit is contained in:
parent
d135ed9c64
commit
bbe8925378
|
@ -8,8 +8,6 @@ Startup:
|
|||
|
||||
* Initializing settings:
|
||||
- from previous session
|
||||
- Filename as absolute path
|
||||
- Filename as relative path
|
||||
- from defaults
|
||||
|
||||
* How the screen looks. Our tests use a level of indirection to check text and
|
||||
|
|
2
main.lua
2
main.lua
|
@ -78,7 +78,6 @@ function load_settings()
|
|||
App.screen.height = settings.height
|
||||
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
||||
love.window.setPosition(settings.x, settings.y, settings.displayindex)
|
||||
if on.load_settings then on.load_settings(settings.app) end
|
||||
else
|
||||
local font_height = 20
|
||||
love.graphics.setFont(love.graphics.newFont(font_height))
|
||||
|
@ -93,6 +92,7 @@ function load_settings()
|
|||
App.screen.flags.minheight = math.min(App.screen.height, 200)
|
||||
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
||||
end
|
||||
if on.load_settings then on.load_settings(settings.app) end
|
||||
end
|
||||
|
||||
function App.resize(w, h)
|
||||
|
|
Loading…
Reference in New Issue