akkartik/carousel.love - Change LPOO23FQ3LG5SVUQ6NRSSN633S7JPHSGNUEDQZQGU5X3X5GETGKQC

resolve conflicts

Created by akkartik on May 20, 2024

LPOO23FQ3LG5SVUQ6NRSSN633S7JPHSGNUEDQZQGU5X3X5GETGKQC

Dependencies

In channels

main

Change contents

Insertion in reference.md at line 91 [4.17]

[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).)

Deletion in reference.md at line 111 [4.17]

B:BD[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).)

Solving an order conflict in reference.md at line 111 [4.17]
[2.756]
[5.2270]

Insertion in main.lua at line 202 [7.2]

[6.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

Solving an order conflict in main.lua at line 224 [7.2]
[2.1337]
[3.270]

Deletion in main.lua at line 226 [7.2]

B:BD[3.275] → [3.275:474]

∅:D[6.71] → [8.165:170]

∅:D[3.474] → [8.165:170]

∅:D[2.1337] → [8.165:170]

B:BD[8.165] → [8.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