akkartik/wardley.love - Change NFFIIQTC2B3E5Q4EJUTLZTPUUMU2S5LM7T2H2P2ENDS7H6XZNYRQC

resolve conflicts

Created by akkartik on July 10, 2023

NFFIIQTC2B3E5Q4EJUTLZTPUUMU2S5LM7T2H2P2ENDS7H6XZNYRQC

Dependencies

In channels

main

Change contents

File un-deletion:
BFD:BF[3.150239] → [3.147103:147103]
Deletion in source_tests.lua at line 22 [7.147166]
B:BD[6.240] → [6.240:275]
```
  Display_width = App.screen.width
```

Replacement in source_tests.lua at line 36 [7.147166]

B:BD[6.787] → [6.787:858]

B:BD[6.934] → [6.934:1688]

B:BD[6.1688] → [8.45:81]

∅:D[8.81] → [6.1714:1775]

B:BD[6.1714] → [6.1714:1775]

B:BD[6.1775] → [4.23423:23474]

∅:D[4.23474] → [6.1890:1927]

B:BD[6.1890] → [6.1890:1927]

B:BD[6.1927] → [4.23475:23594]

∅:D[4.23594] → [6.2174:2212]

B:BD[6.2174] → [6.2174:2212]

B:BD[6.2212] → [4.23595:23758]

∅:D[4.23758] → [6.2503:2595]

B:BD[6.2503] → [6.2503:2595]

function test_show_log_browser_side_doubles_window_width_if_possible()
  -- initialize screen dimensions to half width
  App.screen.init{width=300, height=300}
  Display_width = App.screen.width*2
  -- initialize source app with left side occupying entire window (half the display)
  Current_app = 'source'
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  Editor_state.left = Margin_left
  Editor_state.right = App.screen.width - Margin_right
  local old_editor_right = Editor_state.right
  Text.redraw_all(Editor_state)
  Log_browser_state = edit.initialize_test_state()
  -- log browser has some arbitrary margins
  Log_browser_state.left = 200 + Margin_left
  Log_browser_state.right = 400
  Text.redraw_all(Log_browser_state)
  log_browser.parse(Log_browser_state)
  -- display log browser
  Current_time = Current_time + 0.1
  App.run_after_keychord('C-l')
  -- window width is doubled
  check_eq(App.screen.width, 600, 'display:width')
  -- left side margins are unchanged
  check_eq(Editor_state.left, Margin_left, 'edit:left')
  check_eq(Editor_state.right, old_editor_right, 'edit:right')
  -- log browser margins are adjusted
  check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'log:left')
  check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'log:right')
end
function test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width()

[6.787]

[6.2687]

function test_show_log_browser_side_splits_window_width()

Deletion in source_tests.lua at line 39 [7.147166]
B:BD[6.2796] → [6.2796:2818]
```
  Display_width = 300
```
File un-deletion:
BFD:BF[3.177686] → [3.165766:165766]

Replacement in source.lua at line 124 [7.165829]

B:BD[7.168600] → [10.12:59]

∅:D[10.59] → [7.169203:169289]

∅:D[6.4504] → [7.169203:169289]

B:BD[7.169203] → [7.169203:169289]

  source.resize_window_from_settings(settings)
--?   print('loading source position', settings.x, settings.y, settings.displayindex)

[7.168600]

[7.169289]

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

Replacement in source.lua at line 149 [7.165829]

B:BD[10.71] → [10.71:125]

function source.resize_window_from_settings(settings)

[10.71]

[10.125]

function source.set_window_position_from_settings(settings)

Replacement in source.lua at line 151 [7.165829]

B:BD[10.158] → [10.158:443]

  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

[10.158]

[11.2001]

  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)

Deletion in source.lua at line 157 [7.165829]

B:BD[11.2007] → [10.444:1039]

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

Deletion in source.lua at line 159 [7.165829]

B:BD[7.169801] → [7.169801:169861]

B:BD[7.169861] → [10.1040:1192]

∅:D[10.1192] → [7.170009:170014]

B:BD[7.170009] → [7.170009:170014]

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

Replacement in source.lua at line 170 [7.165829]

B:BD[7.170525] → [10.1193:1517]

∅:D[10.1517] → [7.170525:170546]

B:BD[7.170525] → [7.170525:170546]

B:BD[7.170546] → [6.4505:4614]

∅:D[6.4614] → [7.170661:170796]

B:BD[7.170661] → [7.170661:170796]

  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
  Display_width, Display_height, App.screen.flags = App.screen.size()
  -- shrink height slightly to account for window decoration
  App.screen.height = Display_height-100
  App.screen.width = 40*em_width

[7.170525]

[7.170796]

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

Deletion in source.lua at line 181 [7.165829]

B:BD[7.170832] → [7.170832:170894]

B:BD[7.170894] → [12.12:76]

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

Deletion in source.lua at line 182 [7.165829]

∅:D[6.4690] → [7.171034:171176]

B:BD[7.171034] → [7.171034:171176]

B:BD[7.171176] → [6.4691:4784]

  print('initializing source position')
  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()

Replacement in source.lua at line 272 [7.165829]

B:BD[7.173790] → [7.173790:173872]

B:BD[7.173872] → [6.4785:4880]

∅:D[13.297] → [7.174157:174269]

∅:D[14.647] → [7.174157:174269]

B:BD[7.174157] → [7.174157:174269]

  if Current_app == 'source' then
--?     print('reading source window position')
    Settings.source.x, Settings.source.y, Settings.source.displayindex = App.screen.position()
  end
--?   print('saving source settings', Settings.source.x, Settings.source.y, Settings.source.displayindex)

[7.173790]

[11.2486]

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

Deletion in source.lua at line 357 [7.165829]

B:BD[7.176452] → [6.4881:4950]

      App.screen.width = math.min(Display_width, App.screen.width*2)

Insertion in source.lua at line 358 [7.165829]

[6.5011]

      Editor_state.width = Editor_state.right-Editor_state.left
      Text.redraw_all(Editor_state)

Replacement in source.lua at line 363 [7.165829]

B:BD[7.176525] → [7.176525:176662]

B:BD[7.176662] → [6.5140:5217]

∅:D[6.5217] → [7.176741:176893]

B:BD[7.176741] → [7.176741:176893]

B:BD[7.176893] → [15.12:106]

      App.screen.width = Editor_state.right + Margin_right
    end
--?     print('setting window:', App.screen.width, App.screen.height)
    App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
--?     print('done setting window')
    -- try to restore position if possible
    -- if the window gets wider the window manager may not respect this
    if not App.run_tests then
      source.set_window_position_from_settings(Settings.source)

[7.176525]

[15.106]

      Editor_state.right = App.screen.width - Margin_right
      Editor_state.width = Editor_state.right-Editor_state.left
      Text.redraw_all(Editor_state)

File un-deletion:
BFD:BF[3.184077] → [3.178044:178044]

Replacement in run.lua at line 58 [7.178107]

B:BD[7.179300] → [16.16:60]

B:BD[16.60] → [10.1522:1598]

∅:D[10.1598] → [7.179443:179481]

B:BD[7.179443] → [7.179443:179481]

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

[7.179300]

[7.179554]

  -- set up desired window dimensions and make window resizable
  _, _, App.screen.flags = App.screen.size()

Deletion in run.lua at line 61 [7.178107]

B:BD[7.179590] → [7.179590:179652]

B:BD[7.179652] → [12.81:145]

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

Replacement in run.lua at line 63 [7.178107]

B:BD[10.1674] → [10.1674:1739]

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

[10.1674]

[7.179864]

  run.set_window_position_from_settings(Settings)

Insertion in run.lua at line 70 [7.178107]

[7.180158]

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

Replacement in run.lua at line 91 [7.178107]

B:BD[7.180688] → [10.1740:2064]

∅:D[10.2064] → [7.180688:180709]

B:BD[7.180688] → [7.180688:180709]

B:BD[7.180709] → [10.2065:2104]

  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

[7.180688]

[10.2104]

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

Deletion in run.lua at line 101 [7.178107]

∅:D[10.2180] → [7.180830:180968]

B:BD[7.180830] → [7.180830:180968]

  -- shrink height slightly to account for window decoration
  App.screen.height = App.screen.height-100
  App.screen.width = 40*em_width

Deletion in run.lua at line 102 [7.178107]

B:BD[7.181004] → [7.181004:181066]

B:BD[7.181066] → [12.146:210]

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

Replacement in run.lua at line 153 [7.178107]

B:BD[7.182338] → [17.15:65]

∅:D[17.65] → [18.89:120]

B:BD[7.182338] → [18.89:120]

B:BD[18.120] → [10.2257:2331]

∅:D[13.485] → [7.182571:182577]

∅:D[14.793] → [7.182571:182577]

B:BD[7.182571] → [7.182571:182577]

  if Settings == nil then
    Settings = {}
  end
  if Current_app == 'run' then
    Settings.x, Settings.y, Settings.displayindex = App.screen.position()
  end

[7.182338]

[7.182577]

  if Settings == nil then Settings = {} end
  Settings.x, Settings.y, Settings.displayindex = App.screen.position()

resolve conflicts

Dependencies

In channels

Change contents

File un-deletion:

Deletion in source_tests.lua at line 22 [7.147166]

Replacement in source_tests.lua at line 36 [7.147166]

Deletion in source_tests.lua at line 39 [7.147166]

File un-deletion:

Replacement in source.lua at line 124 [7.165829]

Replacement in source.lua at line 149 [7.165829]

Replacement in source.lua at line 151 [7.165829]

Deletion in source.lua at line 157 [7.165829]

Deletion in source.lua at line 159 [7.165829]

Replacement in source.lua at line 170 [7.165829]

Deletion in source.lua at line 181 [7.165829]

Deletion in source.lua at line 182 [7.165829]

Replacement in source.lua at line 272 [7.165829]

Deletion in source.lua at line 357 [7.165829]

Insertion in source.lua at line 358 [7.165829]

Replacement in source.lua at line 363 [7.165829]

File un-deletion:

Replacement in run.lua at line 58 [7.178107]

Deletion in run.lua at line 61 [7.178107]

Replacement in run.lua at line 63 [7.178107]

Insertion in run.lua at line 70 [7.178107]

Replacement in run.lua at line 91 [7.178107]

Deletion in run.lua at line 101 [7.178107]

Deletion in run.lua at line 102 [7.178107]

Replacement in run.lua at line 153 [7.178107]