akkartik/etch.love - Change KW5JLIPZLEKO5I7PRRX6CDXS75NJZVWA5RB7THUNZNYP6R26I2TQC

resolve conflicts

Created by akkartik on January 22, 2024

KW5JLIPZLEKO5I7PRRX6CDXS75NJZVWA5RB7THUNZNYP6R26I2TQC

Dependencies

In channels

main

Change contents

Replacement in run.lua at line 123 [7.178044]

B:BD[5.1524] → [6.15:54]

  local width = App.width(button_text)

[5.1524]

[3.68]

  local width = Editor_state.font:getWidth(button_text)

Replacement in run.lua at line 144 [7.178044]

B:BD[5.2295] → [6.55:88]

  width = App.width(button_text)

[5.2295]

[3.192]

  width = Editor_state.font:getWidth(button_text)

Deletion in run.lua at line 182 [7.178044]

B:BD[2.77] → [2.77:161]

B:BD[8.146] → [4.90:191]

BD:BD[8.146] → [4.90:191]

  Text.draw_cursor(Editor_state, text_start_x+App.width(Export_filename_value),y-5)
  Text.draw_cursor(Editor_state, text_start_x+Editor_state.font:getWidth(File_select_bar_value),y-5)

Solving an order conflict in run.lua at line 182 [7.178044]
[2.77]

Insertion in run.lua at line 182 [7.178044]

[0.125]

[9.1164]

  Text.draw_cursor(Editor_state, text_start_x+Editor_state.font:getWidth(Export_filename_value),y-5)