resolve conflicts

akkartik

May 20, 2024, 7:01 AM

LPOO23FQ3LG5SVUQ6NRSSN633S7JPHSGNUEDQZQGU5X3X5GETGKQC

Dependencies

• [2] 7EJUTFDQ wire up touch handlers
• [3] OD3WUB5B resolve conflicts
• [4] 36Z442IV back to commit 8123959e52f without code editing
• [5] LXFHXL2N Merge text.love
• [6] RHARLLIQ Merge text0
• [7] N2NUGNN4 include a brief reference enabling many useful apps
• [8] THJX6RCJ Merge text0
• [9] WOVVBEQQ document recent handlers
• [10] RXZQUKKR resolve conflicts
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in reference.md at line 91
  [2.1]

  [2.1]
  + * `on.mouse_focus(in_focus)` -- called when the mouse pointer moves on or off

  + the app window. `in_focus` will be `true` when mouse comes within the window

  + area, and `false` when it goes off.

  + (Based on [LÖVE](https://love2d.org/wiki/love.mousefocus).)

  +
• edit in reference.md at line 111
  [4.3781]→[3.8:267](∅→∅)
  − * `on.mouse_focus(in_focus)` -- called when the mouse pointer moves on or off

  − the app window. `in_focus` will be `true` when mouse comes within the window

  − area, and `false` when it goes off.

  − (Based on [LÖVE](https://love2d.org/wiki/love.mousefocus).)

  −
• resolve order conflict in reference.md at line 111
  [2.756]

  [4.2270]
• edit in main.lua at line 202
  [4.71]

  [2.757]
  + end

  +

  + function App.mousefocus(in_focus)

  + if Mode == 'error' then return end

  + Cursor_time = 0 -- ensure cursor is visible immediately after it moves

  + if on.mouse_focus then on.mouse_focus(in_focus) end
• resolve order conflict in main.lua at line 224
  [2.1337]

  [3.270]
• edit in main.lua at line 226
  [3.275]→[3.275:474](∅→∅),[4.71]→[4.165:170](∅→∅),[3.474]→[4.165:170](∅→∅),[2.1337]→[4.165:170](∅→∅),[4.165]→[4.165:170](∅→∅)
  − function App.mousefocus(in_focus)

  − if Mode == 'error' then return end

  − Cursor_time = 0 -- ensure cursor is visible immediately after it moves

  − if on.mouse_focus then on.mouse_focus(in_focus) end

  − end

  −