pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
May 6, 2025, 11:14 PM
FR52VE6BMKVWZW7TUDOV3WM22M3C52UQP2V6VQM5R5GC2NVDZGMQC

Dependencies

  • [2] G6WO7RL4 resolve conflicts
  • [3] EZ7I57M2 resolve conflicts
  • [4] NVZTMKER partition handlers between screen regions
  • [5] YR7AXEYB add keyboard shortcuts for common operations
  • [6] IP4LD33D mouse events for scrollbar
  • [7] 5RUFNRJO start of the visual skeleton
  • [8] VAVXKWZV aggregate global state inside a 'pane' object
  • [9] ZM7NOBRM new fork: carousel shell
  • [10] XJX53BE3 bugfix: catch errors in mouse_press handlers
  • [11] W4EQ6IW4 simplify state management for menus
  • [12] FIUQJVL2 first draft of load/save buttons
  • [13] RVJNNICY bugfix: autosave settings
  • [14] LGIEVJE6 activate buttons for some time
  • [15] CMZDG7CJ bugfix: tapping in scrollbar area
  • [16] 6DJMOJKE support event handlers
  • [17] OJGIQLZW bugfix: only check for settings menu when open
  • [18] PRE6XPRN responsively increase/decrease font height
  • [19] E3IL2PAK delete duplicate branch
  • [20] HVXZLNCC send errors from event handlers to output editor
  • [21] MZ3DMYPD start sketching out a scrollbar
  • [22] EHKB76GO UI improvement: more stable scrollbar movement
  • [23] OC4P6P36 greatly simplify slider implementation
  • [24] YSSG2JR6 merge bugfix
  • [25] JV27LDDK sliders for font size and color settings
  • [26] Z5M23NTK implement second, 'output' editor
  • [27] 6RYG2FQJ switch all handlers to run either the app or editor
  • [28] Q4CJ4WWU switch to a single global output editor

Change contents

  • resurrect zombie in 0017-on.mouse_release at line 1
    [4.2259]→[4.463:514](∅→∅),[4.2259]→[4.463:514](∅→∅)
    if not Show_code then
    if car.mouse_release then
  • edit in 0017-on.mouse_release at line 1
    [4.2211]
    [4.463]
    on.mouse_release = function(x,y, mouse_button, is_touch, presses)
  • replacement in 0017-on.mouse_release at line 4
    [4.514]→[4.514:570](∅→∅),[4.514]→[4.514:570](∅→∅)
    call_protected(car.mouse_release, x,y, mouse_button)
    [4.514]
    [4.570]
    call_protected(car.mouse_release, x,y, mouse_button, is_touch, presses)
  • replacement in 0017-on.mouse_release at line 7
    [4.604]→[4.604:660](∅→∅),[4.604]→[4.604:660](∅→∅)
    call_protected(car.mousereleased, x,y, mouse_button)
    [4.604]
    [4.660]
    call_protected(car.mousereleased, x,y, mouse_button, is_touch, presses)
  • edit in 0017-on.mouse_release at line 13
    [4.2211]→[3.666:732](∅→∅),[4.2211]→[3.666:732](∅→∅)
    on.mouse_release = function(x,y, mouse_button, is_touch, presses)
  • resolve order conflict in 0017-on.mouse_release at line 13
    [4.739]
    [4.66]
  • resurrect zombie in 0017-on.mouse_release at line 30
    [4.848]→[4.1281:1573](∅→∅),[4.848]→[4.1281:1573](∅→∅)
    elseif Output_editor_state.scrollbar_drag then
    adjust_scrollbar(Output_editor_state, y)
    Output_editor_state.scrollbar_drag = nil
    Output_editor_state.scrollbar_offset = nil
    elseif on_editor_scrollbar_area(Output_editor_state, x,y) then
    adjust_scrollbar(Output_editor_state, y)
  • edit in 0017-on.mouse_release at line 30
    [4.780]
    [4.1281]
    edit.mouse_release(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
  • edit in 0017-on.mouse_release at line 37
    [4.780]→[3.733:820](∅→∅),[4.780]→[3.733:820](∅→∅)
    edit.mouse_release(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
  • resolve order conflict in 0017-on.mouse_release at line 37
    [4.1573]
    [4.1159]
  • edit in 0017-on.mouse_release at line 38
    [4.1222]→[3.821:896](∅→∅),[4.1222]→[3.821:896](∅→∅),[4.1312]→[3.897:972](∅→∅),[4.1312]→[3.897:972](∅→∅)
    call_protected(car.mouse_release, x,y, mouse_button, is_touch, presses)
    call_protected(car.mousereleased, x,y, mouse_button, is_touch, presses)
  • resurrect zombie in 0016-on.mouse_press at line 1
    [4.2409]→[4.921:970](∅→∅),[4.2409]→[4.921:970](∅→∅)
    if not Show_code then
    if car.mouse_press then
  • edit in 0016-on.mouse_press at line 1
    [4.2363]
    [4.921]
    on.mouse_press = function(x,y, mouse_button, is_touch, presses)
  • replacement in 0016-on.mouse_press at line 4
    [4.970]→[4.970:1024](∅→∅),[4.970]→[4.970:1024](∅→∅)
    call_protected(car.mouse_press, x,y, mouse_button)
    [4.970]
    [4.1024]
    call_protected(car.mouse_press, x,y, mouse_button, is_touch, presses)
  • replacement in 0016-on.mouse_press at line 7
    [4.1057]→[4.1057:1112](∅→∅),[4.1057]→[4.1057:1112](∅→∅)
    call_protected(car.mousepressed, x,y, mouse_button)
    [4.1057]
    [4.1112]
    call_protected(car.mousepressed, x,y, mouse_button, is_touch, presses)
  • edit in 0016-on.mouse_press at line 31
    [4.2363]→[3.974:1038](∅→∅),[4.2363]→[3.974:1038](∅→∅)
    on.mouse_press = function(x,y, mouse_button, is_touch, presses)
  • resolve order conflict in 0016-on.mouse_press at line 31
    [4.1854]
    [4.166]
  • resurrect zombie in 0016-on.mouse_press at line 42
    [4.1762]→[4.1575:1860](∅→∅),[4.1762]→[4.1575:1860](∅→∅)
    elseif on_editor_scrollbar(Output_editor_state, x,y) then
    Output_editor_state.scrollbar_drag = true
    local sbtopy = compute_scrollbar_topy(Output_editor_state)
    Output_editor_state.scrollbar_offset = y - sbtopy
    elseif on_editor_scrollbar_area(Output_editor_state, x,y) then
  • edit in 0016-on.mouse_press at line 42
    [4.1696]
    [4.1575]
    edit.mouse_press(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
  • edit in 0016-on.mouse_press at line 48
    [4.1696]→[3.1039:1124](∅→∅),[4.1696]→[3.1039:1124](∅→∅)
    edit.mouse_press(Current_pane.editor_state, x,y, mouse_button, is_touch, presses)
  • resolve order conflict in 0016-on.mouse_press at line 48
    [4.1860]
    [4.1971]
  • edit in 0016-on.mouse_press at line 49
    [4.167]→[3.1125:1198](∅→∅),[4.167]→[3.1125:1198](∅→∅),[4.254]→[3.1199:1273](∅→∅),[4.254]→[3.1199:1273](∅→∅)
    call_protected(car.mouse_press, x,y, mouse_button, is_touch, presses)
    call_protected(car.mousepressed, x,y, mouse_button, is_touch, presses)
  • edit in 0016-on.mouse_press at line 52
    [4.1606]→[3.1274:1277](∅→∅)
    end
  • resolve order conflict in 0016-on.mouse_press at line 52
    [4.1895]
  • resurrect zombie in 0013-on.keychord_press at line 1
    [4.2800]→[4.2027:2375](∅→∅),[4.2800]→[4.2027:2375](∅→∅)
    if Show_code then
    if Show_file_dialog then
    keychord_press_on_file_dialog(chord, key)
    return
    end
    if chord == 'C-=' then
    update_font_settings(Current_pane.editor_state.font_height+2)
    elseif chord == 'C--' then
    update_font_settings(Current_pane.editor_state.font_height-2)
    elseif chord == 'C-0' then
    update_font_settings(20)
  • edit in 0013-on.keychord_press at line 1
    [4.2758]
    [4.2027]
    on.keychord_press = function(chord, key, scancode, is_repeat)
  • edit in 0013-on.keychord_press at line 14
    [4.2758]→[3.1281:1343](∅→∅),[4.2758]→[3.1281:1343](∅→∅)
    on.keychord_press = function(chord, key, scancode, is_repeat)
  • resolve order conflict in 0013-on.keychord_press at line 14
    [2.271]
    [4.3580]
  • edit in 0013-on.keychord_press at line 22
    [2.319]→[2.319:381](∅→∅)
    edit.keychord_press(Current_pane.editor_state, chord, key)
  • resurrect zombie in 0013-on.keychord_press at line 22
    [4.2784]→[3.1344:1427](∅→∅),[4.2784]→[3.1344:1427](∅→∅)
    edit.keychord_press(Current_pane.editor_state, chord, key, scancode, is_repeat)
  • resolve order conflict in 0013-on.keychord_press at line 22
    [2.319]
    [3.1344]
  • resurrect zombie in 0013-on.keychord_press at line 25
    [4.2858]→[2.553:633](∅→∅),[4.2858]→[2.553:633](∅→∅)
    if chord == 'f3' then
    press_show_button()
    elseif car.keychord_press then
  • resurrect zombie in 0013-on.keychord_press at line 28
    [4.1704]→[3.1428:1499](∅→∅),[4.1704]→[3.1428:1499](∅→∅)
    call_protected(car.keychord_press, chord, key, scancode, is_repeat)
  • resolve order conflict in 0013-on.keychord_press at line 28
    [2.633]
    [3.1428]
  • replacement in 0013-on.keychord_press at line 34
    [4.2303]→[2.634:638](∅→∅)
    end
    [4.2303]
    end