akkartik/pong.love - Change A7O6MZIUNUHW65ODP7GLYO37RQ26AOUDGP5Z6M2RG77VZWKL27BQC

redo how we switch between apps

Commit c808ad7bc4 in addition to being ugly, was wrong. Just deconstruct App.quit for ctrl+e.

Created by Kartik K. Agaram on September 2, 2022

A7O6MZIUNUHW65ODP7GLYO37RQ26AOUDGP5Z6M2RG77VZWKL27BQC

Dependencies

In channels

main

Change contents

Replacement in source.lua at line 202 [5.5]

∅:D[3.313] → [4.92:206]

B:BD[6.86] → [4.92:206]

function source.settings(ignore_window_position)
  if Current_app == 'source' and not ignore_window_position then

[3.313]

[4.206]

function source.settings()
  if Current_app == 'source' then

Replacement in pong.splua at line 84 [3.317]

B:BD[3.2518] → [3.2518:2627]

function pong.settings(ignore_window_position)
	if Current_app == 'pong' and not ignore_window_position then

[3.2518]

[3.2627]

function pong.settings()
	if Current_app == 'pong' then

Replacement in pong.lua at line 84 [5.10555]

B:BD[5.12265] → [2.268:377]

function pong.settings(ignore_window_position)
	if Current_app == 'pong' and not ignore_window_position then

[5.12265]

[2.377]

function pong.settings()
	if Current_app == 'pong' then

Insertion in main.lua at line 110 [7.2]

[5.14179]

[5.14214]

    local settings = {
      source=source.settings(),
      pong=pong.settings(),
    }

Insertion in main.lua at line 115 [7.2]
[5.14248]
[5.14248]
```
      if pong.quit then pong.quit() end
```

Insertion in main.lua at line 117 [7.2]

[5.14277]

[8.205]

    elseif Current_app == 'source' then
      if source.quit then source.quit() end
      Current_app = 'pong'

Replacement in main.lua at line 121 [7.2]

B:BD[8.214] → [4.367:468]

∅:D[4.468] → [5.14314:14341]

B:BD[8.214] → [5.14314:14341]

      Settings.source.x, Settings.source.y, Settings.source.displayindex = love.window.getPosition()
      Current_app = 'pong'

[8.214]

[8.289]

      assert(false, 'unknown app "'..Current_app..'"')

Replacement in main.lua at line 123 [7.2]

B:BD[8.297] → [4.469:517]

    App.quit(--[[ignore_window_position]] true)

[8.297]

[9.158]

    settings.current_app = Current_app
    love.filesystem.write('config', json.encode(settings))

Replacement in main.lua at line 188 [7.2]

B:BD[5.16000] → [4.518:621]

  App.quit(nil)
end
function App.quit(ignore_window_position)
  save_settings(ignore_window_position)

[5.16000]

  save_settings()

Replacement in main.lua at line 198 [7.2]
B:BD[6.661] → [4.622:669]
```
function save_settings(ignore_window_position)
```
[6.661]
[6.686]
```
function save_settings()
```

Replacement in main.lua at line 201 [7.2]

B:BD[6.736] → [4.670:722]

B:BD[4.722] → [2.714:762]

    source=source.settings(ignore_window_position),
    pong=pong.settings(ignore_window_position),

[6.736]

[6.796]

    source=source.settings(),
    pong=pong.settings(),

Insertion in Manual_tests.md at line 17 [12.1]

[10.217]

[11.168]


* start out playing pong, press ctrl+e to edit source, make a change to the source, press ctrl+e twice to return to the source editor; the change should be preserved.