Merge lines.love
This commit is contained in:
commit
f611eabad8
4
run.lua
4
run.lua
|
@ -56,7 +56,7 @@ function run.load_settings()
|
||||||
-- set up desired window dimensions
|
-- set up desired window dimensions
|
||||||
App.screen.flags.resizable = true
|
App.screen.flags.resizable = true
|
||||||
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
||||||
App.screen.flags.minheight = math.min(App.screen.width, 200)
|
App.screen.flags.minheight = math.min(App.screen.height, 200)
|
||||||
App.screen.width, App.screen.height = Settings.width, Settings.height
|
App.screen.width, App.screen.height = Settings.width, Settings.height
|
||||||
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
||||||
love.window.setPosition(Settings.x, Settings.y, Settings.displayindex)
|
love.window.setPosition(Settings.x, Settings.y, Settings.displayindex)
|
||||||
|
@ -87,7 +87,7 @@ function run.initialize_window_geometry(em_width)
|
||||||
App.screen.width = 40*em_width
|
App.screen.width = 40*em_width
|
||||||
App.screen.flags.resizable = true
|
App.screen.flags.resizable = true
|
||||||
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
||||||
App.screen.flags.minheight = math.min(App.screen.width, 200)
|
App.screen.flags.minheight = math.min(App.screen.height, 200)
|
||||||
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -172,7 +172,7 @@ function source.initialize_window_geometry(em_width)
|
||||||
App.screen.width = 40*em_width
|
App.screen.width = 40*em_width
|
||||||
App.screen.flags.resizable = true
|
App.screen.flags.resizable = true
|
||||||
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
||||||
App.screen.flags.minheight = math.min(App.screen.width, 200)
|
App.screen.flags.minheight = math.min(App.screen.height, 200)
|
||||||
App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
|
App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
|
||||||
print('initializing source position')
|
print('initializing source position')
|
||||||
if Settings == nil then Settings = {} end
|
if Settings == nil then Settings = {} end
|
||||||
|
|
Loading…
Reference in New Issue