diff options
| -rw-r--r-- | main.lua | 2 | ||||
| -rw-r--r-- | run.lua | 8 | ||||
| -rw-r--r-- | source.lua | 2 | ||||
| -rw-r--r-- | source_file.lua | 10 |
4 files changed, 7 insertions, 15 deletions
diff --git a/main.lua b/main.lua index aadc273..834e13d 100644 --- a/main.lua +++ b/main.lua @@ -82,7 +82,6 @@ function App.initialize(arg) else assert(false, 'unknown app "'..Current_app..'"') end - love.window.setTitle('view.love - '..Current_app) end function App.resize(w,h) @@ -104,7 +103,6 @@ function App.filedropped(file) else assert(false, 'unknown app "'..Current_app..'"') end - love.window.setTitle('view.love - '..Current_app) end function App.focus(in_focus) diff --git a/run.lua b/run.lua index d780f3b..4fd7c25 100644 --- a/run.lua +++ b/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, diff --git a/source.lua b/source.lua index 6f2b131..67d140b 100644 --- a/source.lua +++ b/source.lua @@ -69,6 +69,7 @@ function source.initialize() Menu_status_bar_height = 5 + Editor_state.line_height + 5 Editor_state.top = Editor_state.top + Menu_status_bar_height Log_browser_state.top = Log_browser_state.top + Menu_status_bar_height + love.window.setTitle('view.love - source') end -- environment for a mutable file of bifolded text @@ -196,6 +197,7 @@ function source.filedropped(file) Text.redraw_all(Editor_state) Editor_state.screen_top1 = {line=1, pos=1} Editor_state.cursor1 = {line=1, pos=1} + love.window.setTitle('view.love - source') end -- a copy of source.filedropped when given a filename diff --git a/source_file.lua b/source_file.lua index 978e949..9c0b8a4 100644 --- a/source_file.lua +++ b/source_file.lua @@ -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 = {} |