akkartik/pong.love - Change ETOIYTWWNT52AVFPWXDRUAEM3LQKTMIC6KJLAVMWYZLOHMZW2LSAC

Merge text.love

Created by Kartik K. Agaram on March 19, 2023

ETOIYTWWNT52AVFPWXDRUAEM3LQKTMIC6KJLAVMWYZLOHMZW2LSAC

Dependencies

In channels

main

Change contents

File deletion: edit.lua, source_edit.lua, edit.lua
BFD:BFD[5.2] → [6.16048:16080]
BFD:BFD[5.2] → [7.173:212]
BFD:BFD[7.212] → [6.413:413]
BFD:BFD[5.2] → [6.16048:16080]
BFD:BFD[6.16080] → [6.413:413]
B:BD[6.3539] → [3.26:133]
∅:D[3.133] → [8.97660:97681]
```
    filename = love.filesystem.getSourceBaseDirectory()..'/lines.txt',  -- '/' should work even on Windows
    next_save = nil,
```

File deletion: source.lua, source.lua

BFD:BFD[5.2] → [9.177715:177749]

BFD:BFD[9.177749] → [9.165829:165829]

B:BD[9.170525] → [4.1193:1517]

∅:D[4.1517] → [9.170525:170546]

B:BD[9.169861] → [4.1040:1192]

∅:D[4.1192] → [9.170009:170346]

B:BD[10.2007] → [4.444:1039]

∅:D[4.1039] → [9.169796:169861]

B:BD[10.2001] → [4.60:443]

∅:D[4.443] → [10.2001:2007]

B:BD[9.168600] → [4.12:59]

∅:D[4.59] → [9.169203:169706]

  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
  -- 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)
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)
  -- 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)
  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
  end
  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] → [9.183867:183898]

BFD:BFD[9.183898] → [9.178107:178107]

B:BD[12.120] → [4.2257:2331]

∅:D[4.2331] → [12.198:204]

B:BD[13.210] → [4.2181:2256]

∅:D[4.2256] → [9.181206:181676]

B:BD[9.180709] → [4.2065:2180]

∅:D[4.2180] → [9.180830:181066]

B:BD[9.180688] → [4.1740:2064]

∅:D[4.2064] → [9.180688:180709]

B:BD[9.179787] → [4.1599:1739]

∅:D[4.1739] → [9.179864:180688]

B:BD[14.60] → [4.1522:1598]

∅:D[4.1598] → [9.179443:179481]

    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)
  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(App.screen.width, App.screen.height, App.screen.flags)
  App.screen.move(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
  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 103 [15.5]

B:BD[15.3494] → [15.3494:3557]

B:BD[15.3557] → [16.4318:4427]

∅:D[16.4427] → [15.3672:3938]

B:BD[15.3672] → [15.3672:3938]

B:BD[15.3938] → [17.5:87]

B:BD[17.87] → [16.4428:4503]

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

[15.3494]

[18.5]

  source.resize_window_from_settings(settings)

Insertion in source.lua at line 122 [15.5]

[19.959]

  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 133 [15.5]

[19.965]

[15.4377]

  -- 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 146 [15.5]

B:BD[20.119] → [20.119:267]

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

[20.119]

[20.267]

  -- 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 163 [15.5]

[15.4893]

  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