akkartik/luaML.love - Change JKENJ2UGUCIHH27LSUZLVZIYOTUR3JDWUG453OFYTRL3V3IRQGTAC

Merge lines.love

Created by Kartik K. Agaram on March 19, 2023

JKENJ2UGUCIHH27LSUZLVZIYOTUR3JDWUG453OFYTRL3V3IRQGTAC

Dependencies

In channels

main

Change contents

File deletion: source.lua, source.lua

BFD:BFD[5.2] → [6.177652:177686]

BFD:BFD[6.177686] → [6.165766:165766]

B:BD[7.389] → [8.60:119]

∅:D[4.336] → [8.119:714]

B:BD[8.119] → [8.119:714]

∅:D[8.714] → [6.169733:169798]

B:BD[8.119] → [4.12:336]

B:BD[6.169798] → [3.12:164]

B:BD[6.170462] → [4.337:661]

∅:D[4.661] → [6.170462:170483]

∅:D[3.164] → [6.169946:170283]

B:BD[6.168537] → [8.12:59]

∅:D[8.59] → [6.169140:169643]

end
function source.resize_window_from_settings(settings)
  -- maximize window to determine maximum allowable dimensions
  App.screen.resize(0, 0)  -- maximize
  Display_width, Display_height, App.screen.flags = App.screen.size()
  -- set up desired window dimensions
  App.screen.flags.resizable = true
  App.screen.flags.minwidth = math.min(Display_width, 200)
  App.screen.flags.minheight = math.min(Display_height, 200)
  App.screen.width, App.screen.height = settings.width, settings.height
--?   print('setting window from settings:', App.screen.width, App.screen.height)
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
end
function source.set_window_position_from_settings(settings)
  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
  -- 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)
  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
end
function source.initialize_default_settings()
  local font_height = 20
  love.graphics.setFont(love.graphics.newFont(font_height))
  local em = App.newText(love.graphics.getFont(), 'm')
  source.initialize_window_geometry(App.width(em))
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
  source.resize_window_from_settings(settings)
--?   print('loading source position', settings.x, settings.y, settings.displayindex)
  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

BFD:BFD[5.2] → [6.184046:184077]

BFD:BFD[6.184077] → [6.178044:178044]

B:BD[10.120] → [3.579:653]

∅:D[3.653] → [10.198:204]

B:BD[11.210] → [3.503:578]

∅:D[3.578] → [6.181350:181820]

B:BD[6.180853] → [3.387:502]

∅:D[3.502] → [6.180974:181210]

B:BD[6.179931] → [3.246:386]

B:BD[6.180832] → [4.666:990]

∅:D[4.990] → [6.180832:180853]

∅:D[3.386] → [6.180008:180832]

B:BD[12.60] → [3.169:245]

∅:D[3.245] → [6.179587:179625]

    Settings.x, Settings.y, Settings.displayindex = App.screen.position()
  end
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
end
function run.resize(w, h)
--?   print(("Window resized to width: %d and height: %d."):format(w, h))
  App.screen.width, App.screen.height = w, h
  Text.redraw_all(Editor_state)
  Editor_state.selection1 = {}  -- no support for shift drag while we're resizing
  Editor_state.right = App.screen.width-Margin_right
  Editor_state.width = Editor_state.right-Editor_state.left
  Text.tweak_screen_top_and_cursor(Editor_state, Editor_state.left, Editor_state.right)
end
  App.screen.resize(0, 0)  -- maximize
  App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
  -- shrink height slightly to account for window decoration
  App.screen.height = App.screen.height-100
  App.screen.width = 40*em_width
  App.screen.flags.resizable = true
  App.screen.flags.minwidth = math.min(App.screen.width, 200)
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
  App.screen.move(Settings.x, Settings.y, Settings.displayindex)
  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
  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
function run.initialize_default_settings()
  local font_height = 20
  love.graphics.setFont(love.graphics.newFont(font_height))
  local em = App.newText(love.graphics.getFont(), 'm')
  run.initialize_window_geometry(App.width(em))
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
  Editor_state.font_height = font_height
  Editor_state.line_height = math.floor(font_height*1.3)
  Editor_state.em = em
  Settings = run.settings()
end
function run.initialize_window_geometry(em_width)
  App.screen.width, App.screen.height, App.screen.flags = App.screen.size()
  -- set up desired window dimensions

Replacement in source.lua at line 108 [13.165829]

B:BD[13.168600] → [13.168600:168663]

B:BD[13.168663] → [14.4319:4428]

∅:D[14.4428] → [13.168778:169126]

B:BD[13.168778] → [13.168778:169126]

B:BD[13.169126] → [14.4429:4504]

  -- maximize window to determine maximum allowable dimensions
  App.screen.resize(0, 0)  -- maximize
  Display_width, Display_height, App.screen.flags = App.screen.size()
  -- set up desired window dimensions
  App.screen.flags.resizable = true
  App.screen.flags.minwidth = math.min(Display_width, 200)
  App.screen.flags.minheight = math.min(Display_height, 200)
  App.screen.width, App.screen.height = settings.width, settings.height
--?   print('setting window from settings:', App.screen.width, App.screen.height)
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)

[13.168600]

[13.169203]

  source.resize_window_from_settings(settings)

Insertion in source.lua at line 127 [13.165829]

[15.2001]

  end
end
function source.resize_window_from_settings(settings)
  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

Insertion in source.lua at line 138 [13.165829]

[15.2007]

[13.169796]

  -- maximize window to determine maximum allowable dimensions
  App.screen.resize(0, 0)  -- maximize
  Display_width, Display_height, App.screen.flags = App.screen.size()
  -- set up desired window dimensions
  App.screen.flags.resizable = true
  App.screen.flags.minwidth = math.min(Display_width, 200)
  App.screen.flags.minheight = math.min(Display_height, 200)
  App.screen.width, App.screen.height = settings.width, settings.height
--?   print('setting window from settings:', App.screen.width, App.screen.height)
  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)

Replacement in source.lua at line 151 [13.165829]

B:BD[13.169861] → [13.169861:170009]

  -- setPosition doesn't quite seem to do what is asked of it on Linux.
  love.window.setPosition(settings.x, settings.y-37, settings.displayindex)

[13.169861]

[13.170009]

  -- 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)

Insertion in source.lua at line 168 [13.165829]

[13.170525]

  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

Replacement in run.lua at line 51 [13.178107]

∅:D[16.60] → [13.179363:179443]

B:BD[13.179363] → [13.179363:179443]

  App.screen.width, App.screen.height, App.screen.flags = love.window.getMode()

[16.60]

[13.179443]

  App.screen.width, App.screen.height, App.screen.flags = App.screen.size()

Replacement in run.lua at line 57 [13.178107]

B:BD[13.179787] → [13.179787:179864]

B:BD[13.179864] → [17.15:88]

  love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)
  love.window.setPosition(Settings.x, Settings.y, Settings.displayindex)

[13.179787]

[13.179864]

  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
  App.screen.move(Settings.x, Settings.y, Settings.displayindex)

Insertion in run.lua at line 78 [13.178107]

[13.180688]

  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

Replacement in run.lua at line 86 [13.178107]

B:BD[13.180709] → [13.180709:180830]

  love.window.setMode(0, 0)  -- maximize
  App.screen.width, App.screen.height, App.screen.flags = love.window.getMode()

[13.180709]

[13.180830]

  App.screen.resize(0, 0)  -- maximize
  App.screen.width, App.screen.height, App.screen.flags = App.screen.size()

Replacement in run.lua at line 94 [13.178107]

∅:D[18.210] → [13.181129:181206]

B:BD[13.181129] → [13.181129:181206]

  love.window.setMode(App.screen.width, App.screen.height, App.screen.flags)

[18.210]

[13.181206]

  App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)

Replacement in run.lua at line 141 [13.178107]

B:BD[17.120] → [17.120:198]

    Settings.x, Settings.y, Settings.displayindex = love.window.getPosition()

[17.120]

[17.198]

    Settings.x, Settings.y, Settings.displayindex = App.screen.position()