akkartik/carousel.love - Change VSGPLJFA25LH5JYS5SQBQCKD7T763WSK7UYN4XMOFHUMQWAWSI7QC

resolve conflicts

Created by akkartik on December 29, 2023

VSGPLJFA25LH5JYS5SQBQCKD7T763WSK7UYN4XMOFHUMQWAWSI7QC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua
BFD:BFD[4.2] → [5.165788:165827]
BFD:BFD[4.2] → [5.165788:165827]
BFD:BFD[5.165827] → [5.152503:152503]
B:BD[5.152909] → [3.12:140]
B:BD[6.18272] → [3.141:158]
B:BD[5.155383] → [3.159:189]
B:BD[5.155468] → [3.190:226]
B:BD[5.164055] → [3.227:283]
B:BD[7.557] → [3.284:325]
∅:D[3.325] → [5.164584:164615]
∅:D[3.283] → [5.164128:164178]
∅:D[3.226] → [5.155468:155492]
∅:D[3.189] → [5.155412:155413]
∅:D[3.158] → [5.154867:154929]
∅:D[3.140] → [5.153031:153050]
```
function edit.initialize_state(top, left, right, font, font_height, line_height)  -- currently always draws to bottom of screen
    font = font,
end  -- edit.initialize_state
  love.graphics.setFont(State.font)
  State.font = love.graphics.newFont(State.font_height)
      love.graphics.getFont(),
      14,
      15)  -- line height
end
  State.line_height = math.floor(font_height*1.3)
  App.color(Text_color)
    font_height = font_height,
    line_height = line_height,
  local result = {
```

File deletion: source.lua, source.lua

BFD:BFD[4.2] → [5.177715:177749]

BFD:BFD[5.177749] → [5.165829:165829]

B:BD[5.168531] → [3.327:386]

B:BD[5.169531] → [3.387:559]

B:BD[5.170085] → [3.560:610]

B:BD[9.51] → [3.611:789]

∅:D[3.789] → [10.2008:2044]

∅:D[3.610] → [9.13:51]

∅:D[3.559] → [5.169662:169706]

∅:D[3.386] → [11.72:364]

  local font = love.graphics.newFont(settings.font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
  local font = love.graphics.newFont(font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  Editor_state.filename = 'run.lua'
  source.initialize_window_geometry()
  Editor_state.filename = settings.filename
  -- 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)

File deletion: run.lua, run.lua

BFD:BFD[4.2] → [5.183867:183898]

BFD:BFD[5.183898] → [5.178107:178107]

B:BD[5.179231] → [3.794:853]

B:BD[11.1858] → [3.854:1015]

B:BD[5.180226] → [3.1016:1066]

B:BD[9.137] → [3.1067:1210]

∅:D[3.1210] → [5.180605:180638]

∅:D[3.1066] → [9.102:137]

∅:D[3.1015] → [5.180019:180158]

∅:D[3.853] → [11.1698:1807]

  local font = love.graphics.newFont(Settings.font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, Settings.font_height, math.floor(Settings.font_height*1.3))
  local font = love.graphics.newFont(font_height)
  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
  Settings = run.settings()
end
  run.initialize_window_geometry()
  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()

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[4.2] → [5.202684:202723]

BFD:BFD[5.202723] → [5.191243:191243]

B:BD[5.191636] → [3.1381:1594]

∅:D[3.1594] → [5.191830:192064]

  Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)
  Log_browser_state.filename = 'log'
  load_from_disk(Log_browser_state)  -- TODO: pay no attention to Fold
  log_browser.parse(Log_browser_state)
  Text.redraw_all(Log_browser_state)
  Log_browser_state.screen_top1 = {line=1, pos=1}

Replacement in main.lua at line 99 [15.2]

B:BD[14.3172] → [14.3172:3241]

  love.graphics.setFont(love.graphics.newFont(settings.font_height))

[14.3172]

[16.10]

  local font = love.graphics.newFont(settings.font_height)

Replacement in main.lua at line 106 [15.2]

∅:D[16.166] → [14.3805:3960]

∅:D[17.225] → [14.3805:3960]

∅:D[18.2630] → [14.3805:3960]

B:BD[14.3805] → [14.3805:3960]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, settings.font_height, math.floor(settings.font_height*1.3))

[16.166]

[14.3960]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, settings.font_height, math.floor(settings.font_height*1.3))

Replacement in main.lua at line 124 [15.2]

B:BD[14.4163] → [14.4163:4223]

  love.graphics.setFont(love.graphics.newFont(font_height))

[14.4163]

[19.10]

  local font = love.graphics.newFont(font_height)

Replacement in main.lua at line 126 [15.2]

∅:D[19.41] → [14.4322:4515]

∅:D[20.53] → [14.4322:4515]

B:BD[14.4322] → [14.4322:4515]

  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)

[19.41]

[14.4538]

  Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))