resolve conflicts

akkartik

May 20, 2024, 6:58 AM

OD3WUB5B7ZQDWBWAYNN6INLWIT5Z7UGMIPCLULS4UX5FVXWHTEZQC

Dependencies

• [2] EBRL7VKR resolve conflicts
• [3] 66S4D75Q pijul bugfix
• [4] E3PF2R6Q stray dead code
• [5] VUAAYL6X handlers for _all_ LÖVE events
• [6] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [7] ULKNZUZK resolve conflicts
• [8] 5GHT3LUX copy correct warning message
• [9] F2P336NO resolve conflicts
• [10] Y5XAFGMW Merge text.love
• [11] KJLZCK2R resolve conflicts
• [12] G2SVT3RO Merge text0
• [13] M7UODV5H Merge text0
• [14] RXZQUKKR resolve conflicts
• [*] N2NUGNN4 include a brief reference enabling many useful apps
• [*] THJX6RCJ Merge text0
• [*] OTIBCAUJ love2d scaffold
• [*] RHARLLIQ Merge text0
• [*] LXFHXL2N Merge text.love

Change contents

• edit in reference.md at line 100
  [16.3781]

  [17.2270]
  + * `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 main.lua at line 203
  [19.71]

  [20.165]
  + 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
• edit in main.lua at line 277
  [4.243]→[2.589:589](∅→∅),[4.336]→[3.12:12](∅→∅),[4.336]→[3.12:12](∅→∅)
  −

  −
• resolve order conflict in main.lua at line 277
  [4.243]

  [4.151]