akkartik/carousel.love - Change ZD63LJ2TGWQQ5KWAX22QUWEYI2X5XUI2UTE4E7LGY26AS7HT2WGQC

bugfix: keep the click to create a new drawing from creating a new shape in the drawing

Easiest way to do this is to keep the screen areas for button and drawing disjoint.

Created by Kartik K. Agaram on May 14, 2022

ZD63LJ2TGWQQ5KWAX22QUWEYI2X5XUI2UTE4E7LGY26AS7HT2WGQC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 85 [6.2]

∅:D[2.48] → [5.426:500]

B:BD[5.426] → [5.426:500]

      love.graphics.rectangle('line', 12,line.y, drawingw,pixels(line.h))

[2.48]

[5.500]

      love.graphics.rectangle('line', 16,line.y, drawingw,pixels(line.h))

Replacement in main.lua at line 87 [6.2]

B:BD[5.501] → [5.501:582]

      local mx,my = coord(love.mouse.getX()-12), coord(love.mouse.getY()-line.y)

[5.501]

[7.804]

      local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-line.y)

Replacement in main.lua at line 95 [6.2]

B:BD[8.292] → [3.1308:1345]

        draw_shape(12,line.y, shape)

[8.292]

[7.1043]

        draw_shape(16,line.y, shape)

Replacement in main.lua at line 97 [6.2]

B:BD[7.1053] → [3.1346:1396]

      draw_pending_shape(12,line.y, line.pending)

[7.1053]

[7.1240]

      draw_pending_shape(16,line.y, line.pending)

Replacement in main.lua at line 117 [6.2]

B:BD[9.60] → [5.856:957]

        if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 12 and x < 12+drawingw then

[9.60]

[3.1397]

        if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+drawingw then

Replacement in main.lua at line 119 [6.2]

B:BD[3.1450] → [3.1450:1570]

            table.insert(drawing.pending.points, {x=coord(love.mouse.getX()-12), y=coord(love.mouse.getY()-drawing.y)})

[3.1450]

[3.1570]

            table.insert(drawing.pending.points, {x=coord(love.mouse.getX()-16), y=coord(love.mouse.getY()-drawing.y)})

Replacement in main.lua at line 138 [6.2]

B:BD[3.1855] → [3.1855:1902]

        lines.current.pending.x2 = coord(x-12)

[3.1855]

[3.1902]

        lines.current.pending.x2 = coord(x-16)

Replacement in main.lua at line 152 [6.2]

B:BD[10.316] → [5.1069:1168]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 12 and x < 12+drawingw then

[10.316]

[3.2115]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+drawingw then

Replacement in main.lua at line 154 [6.2]

B:BD[3.2158] → [3.2158:2250]

          drawing.pending = {mode='freehand', points={x=coord(x-12), y=coord(y-drawing.y)}}

[3.2158]

[3.2250]

          drawing.pending = {mode='freehand', points={x=coord(x-16), y=coord(y-drawing.y)}}

Replacement in main.lua at line 156 [6.2]

B:BD[3.2293] → [3.2293:2374]

          drawing.pending = {mode='line', x1=coord(x-12), y1=coord(y-drawing.y)}

[3.2293]

[3.2374]

          drawing.pending = {mode='line', x1=coord(x-16), y1=coord(y-drawing.y)}

Replacement in main.lua at line 287 [6.2]

B:BD[4.640] → [4.640:739]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 12 and x < 12+drawingw then

[4.640]

[4.739]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+drawingw then

Replacement in main.lua at line 299 [6.2]

B:BD[4.955] → [4.955:1054]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 12 and x < 12+drawingw then

[4.955]

[4.1054]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+drawingw then

Replacement in main.lua at line 311 [6.2]

B:BD[11.292] → [5.1169:1354]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 12 and x < 12+drawingw then
        local mx,my = coord(love.mouse.getX()-12), coord(love.mouse.getY()-drawing.y)

[11.292]

[11.384]

      if y >= drawing.y and y < drawing.y + pixels(drawing.h) and x >= 16 and x < 16+drawingw then
        local mx,my = coord(love.mouse.getX()-16), coord(love.mouse.getY()-drawing.y)