resolve conflicts

akkartik

May 20, 2024, 8:11 AM

UIANMV5FD6NB7MJGOTHJREJG7V6JZIYT5JXJR4TFLCZ6KMZRDRJAC

Dependencies

• [2] 7DX2P2KK resolve conflicts
• [3] FLXBLICQ fix a long-standing issue with tooltips
• [4] G6WO7RL4 resolve conflicts
• [5] 2Q437U4F starting to experiment with animated pane transitions
• [6] 4HCP3NTO draw code editor after menu and output
• [7] 5RUFNRJO start of the visual skeleton
• [8] OJGIQLZW bugfix: only check for settings menu when open
• [9] 2NEL7TGN no, go back to drawing the menu after the editor
• [10] FMSRUE5S only show tooltips when window in focus
• [11] 6RYG2FQJ switch all handlers to run either the app or editor
• [12] KCFQO6K5 clean up some debug drawing
• [13] RK2ASPN7 add lots of buttons to the toolbar
• [14] YTPSMU7Y resolve conflicts
• [15] TBTKFVCE resolve conflicts
• [16] Q3EQI5LI some keyboard shortcuts on non-mobile devices
• [17] ZM7NOBRM new fork: carousel shell

Change contents

• replacement in 0012-on.draw at line 29
  [4.3048]→[2.188:214](∅→∅)
  − if Window_in_focus then
  [4.3048]

  [2.214]
  + if Window_in_focus and Mouse_on_window then
• edit in 0012-on.draw at line 32
  [4.2223]→[3.182:227](∅→∅),[4.2223]→[3.182:227](∅→∅),[4.2223]→[3.182:227](∅→∅)
  − if Window_in_focus and Mouse_on_window then
• resolve order conflict in 0012-on.draw at line 32
  [2.258]

  [4.398]