Merge text.love

[?]

Jul 11, 2023, 1:41 AM

FM5LDKGT3WB343RD2HV7NTE4CGTMC77BTQNAQ5OSDPXD2PEWKWBAC

Dependencies

[2] PCEXCSOW Merge text.love
[3] RU4HIK43 Merge lines.love
[4] QD4LOFQR Merge text.love
[5] 6LJZN727 handle chords
[6] VXRYVZ74 Merge text.love
[7] UI3IP45F Merge lines.love
[8] KKMFQDR4 editing source code from within the app
[9] FS2ITYYH record a known issue
[10] 2L5MEZV3 experiment: new edit namespace
[11] T4FRZSYL delete an ancient, unused file
[12] CE4LZV4T drop last couple of manual tests
[13] QS3YLNKZ Merge lines.love
[14] IGBTDA6Y Merge text.love
[15] 2CTN2IEF Merge lines.love
[16] 4YDBYBA4 clean up memory leak experiments
[17] ATQO62TF Merge lines.love
[18] PJ5PQAQE record support for multiple versions
[19] 4SR3Z4Y3 document the version of LÖVE I've been using
[20] A4BSGS2C Merge lines.love
[21] W5H5YI6S Merge text.love
[22] JKENJ2UG Merge lines.love
[23] 36Z442IV back to commit 8123959e52f without code editing
[24] 2344TV56 Merge lines.love
[25] VHUNJHXB Merge lines.love
[26] OTIBCAUJ love2d scaffold
[27] BLWAYPKV extract a module
[28] YDUIKWSF Merge text.love
[29] Q6RXCILQ Merge text.love
[30] TVCPXAAU rename
[31] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[32] K74U4BAU Merge lines.love
[33] VP5KC4XZ Merge lines.love
[34] Y5XAFGMW Merge text.love
[35] 66X36NZN a little more prose describing manual_tests
[36] UAYCSFSK Merge text.love
[37] RSZD5A7G forgot to add json.lua
[38] R5QXEHUI somebody stop me
[39] DUHVCYW5 Merge text.love
[40] 4U4VQWNY Merge lines.love
[41] N2NUGNN4 include a brief reference enabling many useful apps
[42] ZLJYLPOT Merge lines.love
[43] LWPFEZBI Merge lines.love
[44] QF3HGULO Merge text.love
[45] LXTTOB33 extract a couple of files
[46] BULPIBEG beginnings of a module for the text editor
[47] 3PSFWAIL Merge lines.love
[48] VHQCNMAR several more modules
[49] JCXL74WV bring back everything from commit a68647ae22
[50] D76MS2G2 Merge lines.love
[51] DCO5BQWV Merge lines.love
[52] 2CFLXLIE Merge text.love
[53] AVTNUQYR basic test-enabled framework
[54] OGUV4HSA remove some memory leaks from rendered fragments
[55] ECBDENZ4 Merge text.love
[56] ONHKBLLC Merge lines.love
[57] JZR3QMTN Merge lines.love
[58] D2GCFTTT clean up repl functionality
[59] TLOAPLBJ add a license
[60] JOPVPUSA editing source code from within the app
[61] 4HR3G5ZD Merge text.love
[62] KMSL74GA support selections in the source editor
[63] X43ZIKR3 Merge text.love
[64] 73OCE2MC after much struggle, a brute-force undo
[65] NMRUNROT Merge lines.love
[66] MD3W5IRA new fork: rip out drawing support
[67] ORKN6EOB Merge lines.love
[68] JDZVBFEI Merge lines.love
[69] SGMA5JLE save the list of tests in repo
[70] K2X6G75Z start writing some tests for drawings
[71] SHUFMMIV Merge text.love
[72] 3QNOKBFM beginnings of a test harness
[73] XX7G2FFJ intermingle freehand line drawings with text
[74] VXORMHME delete experimental REPL
[75] AYX33NBC Merge lines.love

Change contents

file deletion: source_tests.lua (----------)source_tests.lua (----------)

[4.2]→[4.150262:150302](∅→∅),[4.2]→[4.150262:150302](∅→∅),[4.150302]→[4.147166:147166](∅→∅)

function test_show_log_browser_side_splits_window_width()
-- initialize screen dimensions and indicate that it is maximized
App.screen.init{width=300, height=300}
file deletion: source.lua (----------)source.lua (----------)

[4.2]→[4.177715:177749](∅→∅),[4.2]→[4.177715:177749](∅→∅),[4.177749]→[4.165829:165829](∅→∅)

Editor_state.right = App.screen.width - Margin_right
Editor_state.width = Editor_state.right-Editor_state.left
Text.redraw_all(Editor_state)
end
Editor_state.width = Editor_state.right-Editor_state.left
Text.redraw_all(Editor_state)
Log_browser_state.left = App.screen.width/2 + Margin_left
Log_browser_state.right = App.screen.width - Margin_right
if Settings == nil then Settings = {} end
if Settings.source == nil then Settings.source = {} end
Settings.source.x, Settings.source.y, Settings.source.displayindex = App.screen.position()
File_navigation.cursors[Editor_state.filename] = {cursor1=Editor_state.cursor1, screen_top1=Editor_state.screen_top1}
-- Initialize window width/height and make window resizable.
--
-- I get tempted to have opinions about window dimensions here, but they're
-- non-portable:
-- - maximizing doesn't work on mobile and messes things up
-- - maximizing keeps the title bar on screen in Linux, but off screen on
-- Windows. And there's no way to get the height of the title bar.
-- It seems more robust to just follow LÖVE's default window size until
-- someone overrides it.
App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
App.screen.flags.resizable = true
if os == 'Linux' then
-- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
App.screen.move(settings.x, settings.y-37, settings.displayindex)
else
App.screen.move(settings.x, settings.y, settings.displayindex)
end
function source.set_window_position_from_settings(settings)
local os = love.system.getOS()
-- set up desired window dimensions and make window resizable
_, _, App.screen.flags = App.screen.size()
App.screen.flags.resizable = true
App.screen.width, App.screen.height = settings.width, settings.height
App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
source.set_window_position_from_settings(settings)
Show_log_browser_side = settings.show_log_browser_side
local right = App.screen.width - Margin_right
if Show_log_browser_side then
right = App.screen.width/2 - Margin_right
end
Editor_state = edit.initialize_state(Margin_top, Margin_left, right, settings.font_height, math.floor(settings.font_height*1.3))
Editor_state.filename = settings.filename
file deletion: run.lua (----------)run.lua (----------)

[4.2]→[4.183867:183898](∅→∅),[4.2]→[4.183867:183898](∅→∅),[4.183898]→[4.178107:178107](∅→∅)

if Settings == nil then Settings = {} end
Settings.x, Settings.y, Settings.displayindex = App.screen.position()
return {
-- Initialize window width/height and make window resizable.
--
-- I get tempted to have opinions about window dimensions here, but they're
-- non-portable:
-- - maximizing doesn't work on mobile and messes things up
-- - maximizing keeps the title bar on screen in Linux, but off screen on
-- Windows. And there's no way to get the height of the title bar.
-- It seems more robust to just follow LÖVE's default window size until
-- someone overrides it.
App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
function run.set_window_position_from_settings(settings)
local os = love.system.getOS()
if os == 'Linux' then
-- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
App.screen.move(settings.x, settings.y-37, settings.displayindex)
else
App.screen.move(settings.x, settings.y, settings.displayindex)
end
end

function run.initialize_default_settings()
local font_height = 20
love.graphics.setFont(love.graphics.newFont(font_height))
run.set_window_position_from_settings(Settings)
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
Editor_state.cursor1 = Settings.cursor
end

-- set up desired window dimensions and make window resizable
_, _, App.screen.flags = App.screen.size()
App.screen.flags.resizable = true
replacement in main.lua at line 89

[4.3241]→[4.8:52](∅→∅),[4.52]→[4.8:84](∅→∅),[4.84]→[4.3384:3422](∅→∅),[4.3384]→[4.3384:3422](∅→∅)

-- determine default dimensions and flags
App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
-- set up desired window dimensions

[4.3241]

[4.3495]

-- set up desired window dimensions and make window resizable
_, _, App.screen.flags = App.screen.size()
edit in main.lua at line 92

[4.3531]→[4.3531:3593](∅→∅),[4.3593]→[4.8:72](∅→∅)

App.screen.flags.minwidth = math.min(App.screen.width, 200)
App.screen.flags.minheight = math.min(App.screen.height, 200)
replacement in main.lua at line 94

[4.160]→[4.160:225](∅→∅)

App.screen.move(settings.x, settings.y, settings.displayindex)

[4.160]

[4.3805]

set_window_position_from_settings(settings)
edit in main.lua at line 101

[4.4099]

[4.4099]

function set_window_position_from_settings(settings)
local os = love.system.getOS()
if os == 'Linux' then
-- love.window.setPosition doesn't quite seem to do what is asked of it on Linux.
App.screen.move(settings.x, settings.y-37, settings.displayindex)
else
App.screen.move(settings.x, settings.y, settings.displayindex)
end
end
replacement in main.lua at line 121

[4.4589]→[4.226:550](∅→∅),[4.550]→[4.4589:4610](∅→∅),[4.4589]→[4.4589:4610](∅→∅),[4.4610]→[4.551:590](∅→∅)

local os = love.system.getOS()
if os == 'Android' or os == 'iOS' then
-- maximizing on iOS breaks text rendering: https://github.com/deltadaedalus/vudu/issues/7
-- no point second-guessing window dimensions on mobile
App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
return
end
-- maximize window
App.screen.resize(0, 0) -- maximize

[4.4589]

[4.590]

-- Initialize window width/height and make window resizable.
--
-- I get tempted to have opinions about window dimensions here, but they're
-- non-portable:
-- - maximizing doesn't work on mobile and messes things up
-- - maximizing keeps the title bar on screen in Linux, but off screen on
-- Windows. And there's no way to get the height of the title bar.
-- It seems more robust to just follow LÖVE's default window size until
-- someone overrides it.
edit in main.lua at line 131

[4.666]→[4.4731:4869](∅→∅),[4.4731]→[4.4731:4869](∅→∅)

-- shrink height slightly to account for window decoration
App.screen.height = App.screen.height-100
App.screen.width = 40*em_width
edit in main.lua at line 132

[4.4905]→[4.4905:4967](∅→∅),[4.4967]→[4.73:137](∅→∅)

App.screen.flags.minwidth = math.min(App.screen.width, 200)
App.screen.flags.minheight = math.min(App.screen.height, 200)