resolve conflicts

akkartik

Mar 14, 2024, 5:27 PM

YTPSMU7YTOQQO4BVN6TYEMR4G6HUIDPECHYOYZC6FOWKXQZ3PW4QC

Dependencies

• [2] TBTKFVCE resolve conflicts
• [3] 2NEL7TGN no, go back to drawing the menu after the editor
• [4] 5RUFNRJO start of the visual skeleton
• [5] KCFQO6K5 clean up some debug drawing
• [6] 2Q437U4F starting to experiment with animated pane transitions
• [7] 6RYG2FQJ switch all handlers to run either the app or editor
• [8] RK2ASPN7 add lots of buttons to the toolbar
• [9] G6WO7RL4 resolve conflicts
• [10] 4HCP3NTO draw code editor after menu and output
• [11] Q3EQI5LI some keyboard shortcuts on non-mobile devices
• [*] ZM7NOBRM new fork: carousel shell

Change contents

• edit in 0012-on.draw at line 18
  [4.2962]→[2.169:169](∅→∅),[2.169]→[2.170:184](∅→∅)
  −

  − draw_menu()
• edit in 0012-on.draw at line 27
  [2.333]

  [4.3013]
  + draw_menu()
• edit in 0012-on.draw at line 32
  [4.682]→[2.335:335](∅→∅),[4.8579]→[3.0:13](∅→∅),[4.8579]→[3.0:13](∅→∅),[4.2132]→[3.14:17](∅→∅),[4.2132]→[3.14:17](∅→∅)
  −

  − draw_menu()

  − end
• resolve order conflict in 0012-on.draw at line 32
  [4.682]