resolve conflicts

akkartik

Mar 13, 2024, 6:15 AM

TBTKFVCEHHGHQ3JOZNLOT4PXUYMUGGM4C62KUP7N2KBHIEMXITPQC

Dependencies

• [2] G6WO7RL4 resolve conflicts
• [3] 4HCP3NTO draw code editor after menu and output
• [4] Q4CJ4WWU switch to a single global output editor
• [5] 4OMG2P5E isolate editor UI from some app changes
• [6] WR2WMEPE implement 'Run' button
• [7] IUOZ4YHC use the obvious name for the font global
• [8] JV27LDDK sliders for font size and color settings
• [9] Q3EQI5LI some keyboard shortcuts on non-mobile devices
• [10] 6RYG2FQJ switch all handlers to run either the app or editor
• [11] OE26XIQO bring back syntax highlighting (but so ugly)
• [12] OC4P6P36 greatly simplify slider implementation
• [13] HVXZLNCC send errors from event handlers to output editor
• [14] RK2ASPN7 add lots of buttons to the toolbar
• [15] 7RIDCIVG handle scripts that change the font
• [16] KCFQO6K5 clean up some debug drawing
• [17] 2Q437U4F starting to experiment with animated pane transitions
• [18] 6DJMOJKE support event handlers
• [*] ZM7NOBRM new fork: carousel shell

Change contents

• edit in 0012-on.draw at line 15
  [4.2857]→[4.2857:2874](∅→∅)
  − -- code editor
• edit in 0012-on.draw at line 18
  [4.56]→[3.0:13](∅→∅),[4.56]→[3.0:13](∅→∅)
  − draw_menu()
• resurrect zombie in 0012-on.draw at line 18
  [4.8243]→[3.14:37](∅→∅),[4.8243]→[3.14:37](∅→∅)
  + draw_output_border()
• resolve order conflict in 0012-on.draw at line 18
  [4.2962]
• edit in 0012-on.draw at line 18
  [0.169]

  [3.14]
  + draw_menu()

  + -- output
• replacement in 0012-on.draw at line 21
  [3.37]→[3.37:247](∅→∅),[3.37]→[3.37:247](∅→∅)
  − edit.draw(Current_pane.output_editor_state, Foreground_color, --[[hide cursor]] true)

  − draw_scrollbar(Current_pane.output_editor_state)

  − -- draw editor after menu and output scrollbar so search dialog over
  [3.37]

  [4.8243]
  + edit.draw(Output_editor_state, Foreground_color, --[[hide cursor]] true)

  + draw_scrollbar(Output_editor_state)

  + -- code editor
• edit in 0012-on.draw at line 27
  [4.8416]→[4.2963:2975](∅→∅),[4.8416]→[4.2963:2975](∅→∅),[4.8439]→[4.1865:1978](∅→∅),[4.8439]→[4.1865:1978](∅→∅),[4.1978]→[4.2976:3013](∅→∅),[4.8574]→[4.2976:3013](∅→∅),[4.8574]→[4.2976:3013](∅→∅)
  − -- output

  − edit.draw(Output_editor_state, Foreground_color, --[[hide cursor]] true)

  − draw_scrollbar(Output_editor_state)

  − -- menu and debug UI

  − draw_menu()
• resurrect zombie in 0012-on.draw at line 27
  [4.3013]→[4.3013:3048](∅→∅),[4.3013]→[4.3013:3048](∅→∅),[4.3013]→[4.3013:3048](∅→∅)
  + draw_next_frames_of_animations()
• edit in 0012-on.draw at line 27
  [4.8416]

  [4.3013]
  + --
• edit in 0012-on.draw at line 32
  [4.2132]→[3.248:252](∅→∅),[4.2132]→[3.248:252](∅→∅)
  − end
• resolve order conflict in 0012-on.draw at line 32
  [2.682]