resolve conflicts

akkartik

Feb 25, 2024, 8:27 AM

G6WO7RL4BBE6YAFUPPNVT34YWZNLD7NVJQTO75DW7SVHJTY4FEDQC

Dependencies

• [2] BTMACW42 resolve conflicts
• [3] Q3EQI5LI some keyboard shortcuts on non-mobile devices
• [4] 2Q437U4F starting to experiment with animated pane transitions
• [5] 2L5MEZV3 experiment: new edit namespace
• [6] YV2GBDNW preserve settings across restart
• [7] I27BLL75 new car.quit callback for user scripts
• [8] VAVXKWZV aggregate global state inside a 'pane' object
• [9] VP5KC4XZ Merge lines.love
• [10] 5MEJ7XNH lay out buttons based on device dimensions
• [11] XX7G2FFJ intermingle freehand line drawings with text
• [12] 6VJTQKW7 start supporting LÖVE v12
• [13] 4QFVRJ5U get rid of pane transition animations
• [14] G42WRYFR new handler: mousemoved
• [15] 4YDBYBA4 clean up memory leak experiments
• [16] 73OCE2MC after much struggle, a brute-force undo
• [17] VVGWHJBZ fix app identity so successive versions share data
• [18] IYXT7GFC resolve conflicts
• [19] VHQCNMAR several more modules
• [20] CZQ3NJ4N Merge text0
• [21] 3DRVHB7C run script on startup; new button to switch to source editor
• [22] FS2ITYYH record a known issue
• [23] SIJ5I4NZ extract a helper for buttons
• [24] LWPFEZBI Merge lines.love
• [25] E75L5QGU ok/cancel buttons in file dialog
• [26] PUXFYOQ4 rename a function
• [27] GVJEOWYQ resolve conflicts
• [28] 72OBZ3VM bundle support for .wav files
• [29] MMNPQU6X delete some unused code
• [30] VXRYVZ74 Merge text.love
• [31] WR2WMEPE implement 'Run' button
• [32] OC4P6P36 greatly simplify slider implementation
• [33] KKMFQDR4 editing source code from within the app
• [34] OGUV4HSA remove some memory leaks from rendered fragments
• [35] 6RYGW5H3 bugfix: output border color
• [36] N2NUGNN4 include a brief reference enabling many useful apps
• [37] AVTNUQYR basic test-enabled framework
• [38] VXORMHME delete experimental REPL
• [39] SGMA5JLE save the list of tests in repo
• [40] W3RRTO4P extract a second helper for buttons
• [41] OL7ZCZWD Merge text.love
• [42] 2CFLXLIE Merge text.love
• [43] ZENSSO3D pass remaining love handlers through
• [44] KKQKPGCI resolve conflicts
• [45] 36Z442IV back to commit 8123959e52f without code editing
• [46] HVXZLNCC send errors from event handlers to output editor
• [47] YT7NMQ6Z delete dead code
• [48] D43U7GQ4 alter on-disk representation (manifest files)
• [49] FIUQJVL2 first draft of load/save buttons
• [50] 66X36NZN a little more prose describing manual_tests
• [51] CAG7PP5Y Merge text.love
• [52] SJXIMERS type out a filename to load/save
• [53] 6RYG2FQJ switch all handlers to run either the app or editor
• [54] KMSL74GA support selections in the source editor
• [55] LGIEVJE6 activate buttons for some time
• [56] RSZD5A7G forgot to add json.lua
• [57] ADXY3K5Z wire up new-style car.* handlers
• [58] VSGPLJFA resolve conflicts
• [59] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [60] AZMYKWMH resolve conflicts
• [61] NBTKJTI5 resolve conflicts
• [62] 5OVKHVY6 nice way to make on.* handlers more discoverable
• [63] KCFQO6K5 clean up some debug drawing
• [64] LXTTOB33 extract a couple of files
• [65] PRE6XPRN responsively increase/decrease font height
• [66] 2DVVKKVA flesh out Readme
• [67] QMRQL2FO resolve conflicts
• [68] KJLZCK2R resolve conflicts
• [69] 47VXAH2H delete some old code
• [70] GWLETNMW Mike's suggested button layout
• [71] YR7AXEYB add keyboard shortcuts for common operations
• [72] LRG2TNA7 screens now run
• [73] SIASJPGR save the list of open files across restart
• [74] Q4CJ4WWU switch to a single global output editor
• [75] K2X6G75Z start writing some tests for drawings
• [76] 5RUFNRJO start of the visual skeleton
• [77] X2YWEIZS bugfix: missing variable in a button
• [78] 4SR3Z4Y3 document the version of LÖVE I've been using
• [79] BLWAYPKV extract a module
• [80] VEAVIL4X resize handler
• [81] RJPNFXVQ new fork: a personal dashboard for mobile devices
• [82] R6MNUXDJ pijul bug
• [83] VHUNJHXB Merge lines.love
• [84] OOSUBWKX subject people to a tutorial
• [85] IP4LD33D mouse events for scrollbar
• [86] I52S4E5F running `print` now appends to output editor
• [87] RBWTXOQS get rid of example screens
• [88] W4EQ6IW4 simplify state management for menus
• [89] UEG224LH debug animations
• [90] ROYQO45B mount old location of screens if possible
• [91] JOPVPUSA editing source code from within the app
• [92] NVZTMKER partition handlers between screen regions
• [93] ESOJS6ZW extract a function
• [94] LRDM35CE app running again
• [95] JV27LDDK sliders for font size and color settings
• [96] TLOAPLBJ add a license
• [97] 6DJMOJKE support event handlers
• [98] QWPQUVBR provide a place to set the font
• [99] ZM7NOBRM new fork: carousel shell
• [100] RK2ASPN7 add lots of buttons to the toolbar
• [101] 6MQCFHXM remember when someone deletes an example
• [102] EZHO4TSW new file-system format for freewheeling apps
• [103] BULPIBEG beginnings of a module for the text editor
• [104] 6LJZN727 handle chords
• [105] UUAIVZ4U 2 bugfixes in font rendering
• [106] MBAJPTDJ resolve conflicts
• [107] VUF2SX7B implement carousel buttons for inserting/switching current pane
• [108] VLTU33KW resolve conflicts
• [109] 3QNOKBFM beginnings of a test harness
• [110] OGDDLU5B close all menus when tapping any button
• [111] BH4QJ5CH extract functions for computing editor dimensions
• [112] 4GX6NAY4 some very basic animations for switching panes
• [113] ED4Z6ORC cleaner API for file-system access
• [114] PN6VP3LV escape hatch when print is overridden
• [115] GVX7YSQY initial script after splitting up text-zoom
• [116] PCHTG7YU resolve conflicts
• [117] FVXR2WIW 'run_screen' for loading one screen from another
• [118] TBTRYEBP Merge lines.love
• [119] CMZDG7CJ bugfix: tapping in scrollbar area
• [120] QLJY3CKC bugfix: use border color in scrollbars
• [121] PTBOQDJ7 resolve stale conflicts
• [122] D2GCFTTT clean up repl functionality
• [123] 57HKHZ7Z include the tool that's mentioned in representation.md
• [124] TVCPXAAU rename
• [125] ZLJYLPOT Merge lines.love
• [126] URM35DJS rip out the canvas
• [127] OJGIQLZW bugfix: only check for settings menu when open
• [128] OTIBCAUJ love2d scaffold
• [129] 3PSFWAIL Merge lines.love
• [130] TOXPJJYY resolve conflicts
• [131] PJ5PQAQE record support for multiple versions
• [132] R5QXEHUI somebody stop me
• [133] Z5M23NTK implement second, 'output' editor
• [134] MZ3DMYPD start sketching out a scrollbar
• [135] ZOLCTAGU get rid of an assertion
• [136] SW5GN5LP suggest a default layout for freewheeling apps
• [137] ORKN6EOB Merge lines.love
• [138] CE4LZV4T drop last couple of manual tests
• [139] T4FRZSYL delete an ancient, unused file

Change contents

• file deletion: 0106-stop_button (----------)0106-stop_button (----------)
  [4.2]→[4.0:40](∅→∅),[4.2]→[4.0:40](∅→∅),[4.40]→[4.41:41](∅→∅)
  − end

  − styled_button('stop', x,y, press_stop_button, not Is_mobile and Show_code and 'F2')

  − local w = Font:getWidth('stop')+10
• file deletion: 0065-hide_code_button (----------)0065-hide_code_button (----------)
  [4.2]→[4.5120:5165](∅→∅),[4.2]→[4.5120:5165](∅→∅),[4.5165]→[4.4728:4728](∅→∅)
  − return overflowable_button('hide', x, y, r, press_hide_button, nil, not Is_mobile and 'F3')

  − end
• file deletion: 0064-show_code_button (----------)0064-show_code_button (----------)
  [4.2]→[4.5558:5603](∅→∅),[4.2]→[4.5558:5603](∅→∅),[4.5603]→[4.5167:5167](∅→∅)
  − return overflowable_button('show', x, y, r, press_show_button, nil, not Is_mobile and 'F3')

  − end
• edit in 0168-press_previous_pane_button at line 4
  [3.943]→[4.59:83](∅→∅),[4.59]→[4.59:83](∅→∅)
  − Current_pane.car = car
• replacement in 0168-press_previous_pane_button at line 6
  [4.168]→[4.168:201](∅→∅)
  − car = Current_pane.car or {}

  − end
  [4.168]
  + end
• edit in 0167-press_next_pane_button at line 4
  [3.993]→[4.313:337](∅→∅),[4.313]→[4.313:337](∅→∅)
  − Current_pane.car = car
• replacement in 0167-press_next_pane_button at line 6
  [4.422]→[4.422:455](∅→∅)
  − car = Current_pane.car or {}

  − end
  [4.422]
  + end
• replacement in 0161-press_run_button at line 3
  [4.1992]→[4.1992:2866](∅→∅)
  − -- ## run: initialize

  − clear_handlers()

  − local buf = table.concat(map(Current_pane.editor_state.lines, function(line) return line.data end), '\n')

  − Current_pane.canvas = love.graphics.newCanvas()

  − love.graphics.setCanvas(Current_pane.canvas)

  − love.graphics.push('all')

  − love.graphics.setBackgroundColor(1,1,1)

  − edit.clear(Current_pane.output_editor_state)

  − print = print_to_output

  − -- ## run

  − local status, result = live.eval(buf, 'editor')

  − -- ## run: save some stuff, clean up the rest

  − print = Real_print

  − if result then

  − -- could be either output or error

  − table.insert(Current_pane.output_editor_state.lines, {data=tostring(result)})

  − end

  − if #Current_pane.output_editor_state.lines == 0 then

  − table.insert(Current_pane.output_editor_state.lines, {data=''})

  − end

  − Text.redraw_all(Current_pane.output_editor_state)

  − love.graphics.pop()

  − love.graphics.setCanvas()

  − end
  [4.1992]
  + run_app()

  + end
• replacement in 0060-next_pane_button at line 13
  [4.6672]→[4.757:760](∅→∅),[4.6672]→[4.3317:3320](∅→∅)
  − end

  − end
  [4.6672]
  + end
• replacement in 0059-previous_pane_button at line 12
  [4.7215]→[4.761:764](∅→∅),[4.7215]→[4.3364:3367](∅→∅)
  − end

  − end
  [4.7215]
  + end
• edit in 0051-run_button at line 2
  [4.616]→[4.1829:1842](∅→∅),[4.616]→[4.1829:1842](∅→∅)
  − run_app()
• replacement in 0051-run_button at line 5
  [4.4086]→[4.3419:3422](∅→∅)
  − end
  [4.4086]
  + end
• edit in 0013-on.keychord_press at line 13
  [4.2375]→[4.2375:2546](∅→∅),[4.2244]→[4.3455:3522](∅→∅),[4.2244]→[4.3455:3522](∅→∅),[4.2692]→[4.3523:3580](∅→∅),[4.2692]→[4.3523:3580](∅→∅)
  − else

  − if Current_pane.editor_state.cursor_x then

  − -- send keys to editor if cursor is visible

  − edit.keychord_press(Current_pane.editor_state, chord, key)

  − end

  − elseif not Show_code and chord == 'f3' then

  − press_show_button()

  − if chord == 'C-left' then press_previous_pane_button()
• resurrect zombie in 0013-on.keychord_press at line 13
  [4.3580]→[4.3580:3926](∅→∅),[4.3580]→[4.3580:3926](∅→∅)
  + elseif chord == 'C-right' then press_next_pane_button()

  + elseif chord == 'f1' then press_run_button()

  + elseif chord == 'f2' then press_stop_button()

  + elseif chord == 'f3' then press_hide_button()

  + elseif chord == 'f4' then press_save_button()

  + elseif chord == 'f5' then press_load_button()

  + elseif Current_pane.editor_state.cursor_x then
• resolve order conflict in 0013-on.keychord_press at line 13
  [4.2375]
• edit in 0013-on.keychord_press at line 13
  [0.209]

  [4.3580]
  + elseif chord == 'C-left' then press_previous_pane_button()
• edit in 0013-on.keychord_press at line 21
  [4.3926]

  [4.2846]
  + -- send keys to editor if cursor is visible

  + edit.keychord_press(Current_pane.editor_state, chord, key)

  + else

  + if Current_pane.editor_state.cursor_x then

  + -- send keys to editor if cursor is visible

  + edit.keychord_press(Current_pane.editor_state, chord, key)

  + end
• replacement in 0013-on.keychord_press at line 30
  [4.2878]→[4.1675:1704](∅→∅)
  − if car.keychord_press then
  [4.2858]

  [4.1704]
  + if chord == 'f3' then

  + press_show_button()

  + elseif car.keychord_press then
• replacement in 0013-on.keychord_press at line 39
  [4.2303]→[4.4074:4077](∅→∅)
  − end
  [4.2303]
  + end
• edit in 0012-on.draw at line 29
  [4.3048]

  [4.8574]
  + draw_button_tooltips(Global_state)
• replacement in 0012-on.draw at line 31
  [4.2223]→[3.2096:2132](∅→∅),[4.2223]→[3.2096:2132](∅→∅),[3.2132]→[4.146:149](∅→∅),[4.2223]→[4.146:149](∅→∅)
  − draw_button_tooltips(Global_state)

  − end
  [4.8579]
  + end