From 0b1c47f79f71a9af77d042497c72d89a8d616ea2 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 25 Mar 2023 10:34:58 -0700 Subject: experiment at avoiding some merge conflicts https://merveilles.town/@akkartik/110084833821965708 --- run.lua | 13 +++++++++++++ source.lua | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/run.lua b/run.lua index 17477ea..f68efa4 100644 --- a/run.lua +++ b/run.lua @@ -33,8 +33,14 @@ function run.initialize(arg) Text.redraw_all(Editor_state) end edit.check_locs(Editor_state) + + + + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708 love.window.setTitle('lines.love - '..Editor_state.filename) + + if #arg > 1 then print('ignoring commandline args after '..arg[1]) end @@ -117,7 +123,14 @@ function run.file_drop(file) file:close() Text.redraw_all(Editor_state) edit.check_locs(Editor_state) + + + + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708 love.window.setTitle('lines.love - '..Editor_state.filename) + + + end function run.draw() diff --git a/source.lua b/source.lua index 462985c..2413eb0 100644 --- a/source.lua +++ b/source.lua @@ -72,7 +72,14 @@ 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 + + + + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708 love.window.setTitle('lines.love - source') + + + end -- environment for a mutable file @@ -218,7 +225,14 @@ function source.file_drop(file) Text.redraw_all(Editor_state) Editor_state.screen_top1 = {line=1, pos=1} Editor_state.cursor1 = {line=1, pos=1} + + + + -- keep a few blank lines around: https://merveilles.town/@akkartik/110084833821965708 love.window.setTitle('lines.love - source') + + + end -- a copy of source.file_drop when given a filename -- cgit 1.4.1-2-gfad0