Merge lines.love
This commit is contained in:
commit
21efba975d
4
main.lua
4
main.lua
|
@ -83,7 +83,7 @@ function App.initialize(arg)
|
|||
else
|
||||
assert(false, 'unknown app "'..Current_app..'"')
|
||||
end
|
||||
love.window.setTitle('text.love - '..Current_app)
|
||||
love.window.setTitle('lines.love - '..Current_app)
|
||||
end
|
||||
|
||||
function App.resize(w,h)
|
||||
|
@ -105,7 +105,7 @@ function App.filedropped(file)
|
|||
else
|
||||
assert(false, 'unknown app "'..Current_app..'"')
|
||||
end
|
||||
love.window.setTitle('text.love - '..Current_app)
|
||||
love.window.setTitle('lines.love - '..Current_app)
|
||||
end
|
||||
|
||||
function App.focus(in_focus)
|
||||
|
|
8
run.lua
8
run.lua
|
@ -53,12 +53,12 @@ function run.load_settings()
|
|||
-- maximize window to determine maximum allowable dimensions
|
||||
App.screen.width, App.screen.height, App.screen.flags = love.window.getMode()
|
||||
-- set up desired window dimensions
|
||||
love.window.setPosition(Settings.x, Settings.y, Settings.displayindex)
|
||||
App.screen.flags.resizable = true
|
||||
App.screen.flags.minwidth = math.min(App.screen.width, 200)
|
||||
App.screen.flags.minheight = math.min(App.screen.width, 200)
|
||||
App.screen.width, App.screen.height = Settings.width, Settings.height
|
||||
love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
|
||||
love.window.setPosition(Settings.x, Settings.y, Settings.displayindex)
|
||||
Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, Settings.font_height, math.floor(Settings.font_height*1.3))
|
||||
Editor_state.filename = Settings.filename
|
||||
Editor_state.screen_top1 = Settings.screen_top
|
||||
|
@ -129,13 +129,15 @@ function run.quit()
|
|||
end
|
||||
|
||||
function run.settings()
|
||||
local x,y,displayindex = love.window.getPosition()
|
||||
if Current_app == 'run' then
|
||||
Settings.x, Settings.y, Settings.displayindex = love.window.getPosition()
|
||||
end
|
||||
local filename = Editor_state.filename
|
||||
if filename:sub(1,1) ~= '/' then
|
||||
filename = love.filesystem.getWorkingDirectory()..'/'..filename -- '/' should work even on Windows
|
||||
end
|
||||
return {
|
||||
x=x, y=y, displayindex=displayindex,
|
||||
x=Settings.x, y=Settings.y, displayindex=Settings.displayindex,
|
||||
width=App.screen.width, height=App.screen.height,
|
||||
font_height=Editor_state.font_height,
|
||||
filename=filename,
|
||||
|
|
|
@ -56,16 +56,6 @@ function save_to_disk(State)
|
|||
outfile:close()
|
||||
end
|
||||
|
||||
function file_exists(filename)
|
||||
local infile = App.open_for_reading(filename)
|
||||
if infile then
|
||||
infile:close()
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
-- for tests
|
||||
function load_array(a)
|
||||
local result = {}
|
||||
|
|
Loading…
Reference in New Issue