akkartik/sokoban.love - Change HYEAFRZ2UEKDYTAE2GDQLHEJBPQASP2NDLMXB7F6MTVK2BKOXKEAC

split mouse_pressed events between Text and Drawing

Created by Kartik K. Agaram on May 18, 2022

HYEAFRZ2UEKDYTAE2GDQLHEJBPQASP2NDLMXB7F6MTVK2BKOXKEAC

Dependencies

In channels

main

Change contents

Insertion in text.lua at line 144 [2.1]

[2.464]

end
function Text.in_line(line, x,y)
  return x >= 16 and y >= line.y and y < line.y+15*Zoom
end
function Text.move_cursor(line_index, line, x, hint)
  Cursor_line = line_index
  Cursor_pos = Text.nearest_cursor_pos(line.data, x)

Replacement in text.lua at line 163 [2.1]

B:BD[2.643] → [2.643:739]

  local currx = Text.cursor_x(line, hint)
  if currx > x-2 and currx < x+2 then
    return hint

[2.643]

[2.739]

  if hint then
    local currx = Text.cursor_x(line, hint)
    if currx > x-2 and currx < x+2 then
      return hint
    end

Replacement in text.lua at line 170 [2.1]

B:BD[2.778] → [2.778:838]

  if currx > x then
    right = hint
  else
    left = hint

[2.778]

[2.838]

  if hint then
    if currx > x then
      right = hint
    else
      left = hint
    end

Replacement in main.lua at line 161 [6.2]

B:BD[5.208] → [5.208:229]

B:BD[5.229] → [3.74:135]

∅:D[3.135] → [7.347:380]

B:BD[8.1934] → [7.347:380]

B:BD[7.380] → [2.1578:1640]

      -- move cursor
      if x >= 16 and y >= line.y and y < line.y+15*Zoom then
        Cursor_line = line_index
        Cursor_pos = Text.nearest_cursor_pos(line.data, x, 1)

[5.208]

[5.361]

      if Text.in_line(line, x,y) then
        Text.move_cursor(line_index, line, x)

Replacement in main.lua at line 165 [6.2]

B:BD[5.410] → [5.410:437]

∅:D[5.437] → [9.76:132]

B:BD[9.76] → [9.76:132]

B:BD[9.132] → [4.726:1722]

∅:D[4.1722] → [9.955:967]

∅:D[8.2601] → [9.955:967]

B:BD[9.955] → [9.955:967]

B:BD[9.967] → [10.537:569]

      local drawing = line
      local x, y = love.mouse.getX(), love.mouse.getY()
      if y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width then
        if Current_drawing_mode == 'freehand' then
          drawing.pending = {mode=Current_drawing_mode, points={{x=Drawing.coord(x-16), y=Drawing.coord(y-drawing.y)}}}
        elseif Current_drawing_mode == 'line' or Current_drawing_mode == 'manhattan' then
          local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
          drawing.pending = {mode=Current_drawing_mode, p1=j}
        elseif Current_drawing_mode == 'polygon' then
          local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
          drawing.pending = {mode=Current_drawing_mode, vertices={j}}
        elseif Current_drawing_mode == 'circle' then
          local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
          drawing.pending = {mode=Current_drawing_mode, center=j}
        end
        Lines.current = drawing

[5.410]

[9.999]

      if Drawing.in_drawing(line, x, y) then
        Drawing.mouse_pressed(line, x,y, button)

Insertion in drawing.lua at line 50 [11.98]

[4.19072]

end
function Drawing.in_drawing(drawing, x,y)
  return y >= drawing.y and y < drawing.y + Drawing.pixels(drawing.h) and x >= 16 and x < 16+Drawing_width
end
function Drawing.mouse_pressed(drawing, x,y, button)
  if Current_drawing_mode == 'freehand' then
    drawing.pending = {mode=Current_drawing_mode, points={{x=Drawing.coord(x-16), y=Drawing.coord(y-drawing.y)}}}
  elseif Current_drawing_mode == 'line' or Current_drawing_mode == 'manhattan' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
    drawing.pending = {mode=Current_drawing_mode, p1=j}
  elseif Current_drawing_mode == 'polygon' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
    drawing.pending = {mode=Current_drawing_mode, vertices={j}}
  elseif Current_drawing_mode == 'circle' then
    local j = Drawing.insert_point(drawing.points, Drawing.coord(x-16), Drawing.coord(y-drawing.y))
    drawing.pending = {mode=Current_drawing_mode, center=j}
  end
  Lines.current = drawing