resolve conflicts

akkartik

Oct 26, 2025, 6:56 AM

SWEQVCBONCI2FVJEB622IPEVEU7E5F722SDPXS7IR66YTPDXPJOAC

Dependencies

• [2] GVX7YSQY initial script after splitting up text-zoom
• [3] A3AXYFVA resolve conflicts
• [4] E2XJIARZ switch mouse icon over menu buttons
• [5] 6RYG2FQJ switch all handlers to run either the app or editor
• [6] BQTHWI4A check slider state more precisely
• [7] HVXZLNCC send errors from event handlers to output editor
• [8] DDWCYLPL explicitly state stance on autosave
• [9] JV27LDDK sliders for font size and color settings
• [10] IP4LD33D mouse events for scrollbar
• [11] NVZTMKER partition handlers between screen regions
• [12] LGIEVJE6 activate buttons for some time
• [13] UEG224LH debug animations
• [14] Q4CJ4WWU switch to a single global output editor
• [15] OC4P6P36 greatly simplify slider implementation

Change contents

• edit in screens/main at line 17
  [2.6915]

  [2.6915]
  + local x, y = love.mouse.getPosition()

  + if mouse_hover_on_any_button(ui_state, x,y) then

  + love.mouse.setCursor(Hand_icon)

  + else

  + love.mouse.setCursor(Arrow_icon)

  + end
• edit in 0004-on.update at line 10
  [5.3253]

  [5.3253]
  + local x, y = love.mouse.getPosition()

  + if mouse_hover_on_any_button(Global_state, x,y) then

  + love.mouse.setCursor(Hand_icon)

  + else

  + love.mouse.setCursor(Arrow_icon)

  + end
• resurrect zombie in 0004-on.update at line 25
  [5.699]→[4.278:283](∅→∅),[5.699]→[4.278:283](∅→∅)
  + end
• resolve order conflict in 0004-on.update at line 25
  [3.240]

  [4.278]
• replacement in 0004-on.update at line 26
  [4.283]→[4.283:451](∅→∅),[4.283]→[4.283:451](∅→∅),[3.240]→[5.699:704](∅→∅),[4.451]→[5.699:704](∅→∅),[5.3589]→[5.699:704](∅→∅),[5.699]→[5.699:704](∅→∅),[5.704]→[3.241:245](∅→∅),[5.1949]→[4.452:456](∅→∅),[5.1949]→[4.452:456](∅→∅)
  − local x, y = love.mouse.getPosition()

  − if mouse_hover_on_any_button(Global_state, x,y) then

  − love.mouse.setCursor(Hand_icon)

  − else

  − love.mouse.setCursor(Arrow_icon)

  − end

  − end

  − end
  [4.283]
  + end