resolve conflicts

akkartik

Dec 29, 2023, 9:38 PM

KF72R2XXLH3T6A23JRVR23E77IHVCX7EJA26ZB5RZ2SHFVCRVVVAC

Dependencies

• [2] VYIA2JFX resolve conflicts
• [3] ZMBPXIZ4 bugfix
• [4] VN3MTXFK Merge lines.love
• [5] 4KC7I3E2 make colors easier to edit
• [6] 2WGHUWE6 self-documenting 0 Test_right_margin
• [7] 7VGDIPLC more robust state validation
• [8] H6QZ7GRR more precise name
• [9] KNWMKLNJ Merge lines.love
• [10] APOMBXMU resolve conflicts
• [11] CNCYMM6A make test initializations a little more obvious
• [12] G3PZV45B Merge lines.love
• [13] 5CDHNEKR Merge lines.love
• [14] APYPFFS3 call edit rather than App callbacks in tests
• [15] R3KXFRZN get rid of to_text
• [16] P4NJ2KS7 resolve conflicts
• [17] LF7BWEG4 group all editor globals
• [18] 2L5MEZV3 experiment: new edit namespace
• [19] KKMFQDR4 editing source code from within the app
• [20] 5RDWSYK2 consistently use App names for methods everywhere
• [21] 57OGXVHZ Merge lines.love
• [22] 5XA7TKWY pull font into editor
• [23] RRDO6H7H bugfix
• [24] PP2IIHL6 stop putting button state in a global
• [25] FTB4YNQU Merge lines.love
• [26] LNUHQOGH start passing in Editor_state explicitly
• [27] OWE64YJ2 Merge lines.love
• [28] Z5WOBP27 Merge lines.love
• [29] CIK3U5S6 Merge lines.love
• [30] UZQ2LGHQ bugfix: preserve window position

Change contents

• edit in run.lua at line 66
  [4.67]

  [4.68]
  + 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))
• edit in run.lua at line 176
  [4.184045]→[4.210:210](∅→∅),[4.67]→[3.483:644](∅→∅),[4.67]→[3.483:644](∅→∅)
  −

  − 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))
• resolve order conflict in run.lua at line 176
  [4.184045]
• resurrect zombie in edit.lua at line 109
  [4.98042]→[4.1495:1525](∅→∅),[4.98042]→[4.1495:1525](∅→∅)
  + end -- edit.initialize_state
• edit in edit.lua at line 162
  [4.509]

  [4.509]
  + love.graphics.setFont(State.font)
• replacement in edit.lua at line 555
  [4.15644]→[4.15644:15710](∅→∅)
  − love.graphics.setFont(love.graphics.newFont(State.font_height))
  [4.15644]

  [4.15710]
  + State.font = love.graphics.newFont(State.font_height)
• replacement in edit.lua at line 572
  [4.16196]→[4.16196:16250](∅→∅)
  − 14, -- font height assuming default LÖVE font
  [4.16196]

  [4.16250]
  + love.graphics.getFont(),

  + 14,
• edit in edit.lua at line 622
  [4.17561]→[2.102:102](∅→∅),[4.1119]→[4.1620:1651](∅→∅),[4.1119]→[4.1620:1651](∅→∅),[4.264]→[4.1563:1619](∅→∅),[4.264]→[4.1563:1619](∅→∅),[4.44]→[4.1526:1562](∅→∅),[4.44]→[4.1526:1562](∅→∅),[4.1651]→[3.1328:1338](∅→∅),[4.1651]→[3.1328:1338](∅→∅)
  −

  − love.graphics.getFont(),

  − State.font = love.graphics.newFont(State.font_height)

  − love.graphics.setFont(State.font)

  − 14,
• resolve order conflict in edit.lua at line 622
  [4.17561]