akkartik/pong.love - Change XPXYD64Y76UT24GENTC6IWYNYWRCTZZE55YCBGWJT7YAYHIFZLXQC

fix signature of Text.draw

Created by Kartik K. Agaram on August 17, 2022

XPXYD64Y76UT24GENTC6IWYNYWRCTZZE55YCBGWJT7YAYHIFZLXQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 10 [6.1]

B:BD[5.91] → [5.91:163]

-- return the final y, and position of start of final screen line drawn

[5.91]

[5.163]

-- return the final y, and pos,posB of start of final screen line drawn

Replacement in text.lua at line 17 [6.1]
∅:D[7.27] → [8.1747:1768]
∅:D[9.72] → [8.1747:1768]
∅:D[10.81] → [8.1747:1768]
∅:D[5.260] → [8.1747:1768]
∅:D[11.3820] → [8.1747:1768]
B:BD[6.141] → [8.1747:1768]
```
  -- wrap long lines
```
[11.3820]
[12.3]
```
  -- draw A side
```

Replacement in text.lua at line 29 [6.1]

B:BD[12.207] → [3.3:15]

∅:D[3.15] → [13.3:44]

B:BD[12.207] → [13.3:44]

∅:D[13.44] → [14.3:56]

B:BD[12.248] → [14.3:56]

∅:D[15.33] → [16.3:122]

∅:D[14.56] → [16.3:122]

B:BD[12.284] → [16.3:122]

∅:D[16.122] → [12.383:614]

B:BD[12.383] → [12.383:614]

B:BD[12.614] → [15.34:76]

∅:D[15.76] → [12.662:732]

B:BD[12.662] → [12.662:732]

B:BD[12.732] → [2.3:139]

∅:D[2.139] → [16.261:345]

∅:D[13.183] → [16.261:345]

B:BD[16.261] → [16.261:345]

B:BD[16.345] → [4.193:416]

  -- B side
  if line.dataB and #line.dataB > 0 then
    if not State.expanded and not line.expanded then
      button('expand', {x=x+2*App.width(State.em), y=y+2, w=App.width(State.em), h=State.line_height-4, color={1,1,1},
        icon = function(x,y)
                 App.color(Fold_background_color)
                 love.graphics.rectangle('fill', x, y, App.width(State.em), State.line_height-4, 2,2)
               end,
        onpress1 = function()
                     line.expanded = true
                   end,
      })
    else
      App.color(Fold_color)
      overflows_screen, x, y, pos, screen_line_starting_pos = Text.draw_wrapping_lineB(State, line_index, x+2*App.width(State.em),y, 1)
      if overflows_screen then
        return y, screen_line_starting_pos
      end
      if State.cursor1.posB then
        if State.search_term == nil then
          if line_index == State.cursor1.line and State.cursor1.posB == pos then
            Text.draw_cursor(State, x, y)
          end
        end

[12.207]

[4.416]

  -- check for B side
  if line.dataB == nil or #line.dataB == 0 then
    return y, screen_line_starting_pos
  end
  if not State.expanded and not line.expanded then
    button('expand', {x=x+2*App.width(State.em), y=y+2, w=App.width(State.em), h=State.line_height-4, color={1,1,1},
      icon = function(x,y)
               App.color(Fold_background_color)
               love.graphics.rectangle('fill', x, y, App.width(State.em), State.line_height-4, 2,2)
             end,
      onpress1 = function()
                   line.expanded = true
                 end,
    })
    return y, screen_line_starting_pos
  end
  -- draw B side
  App.color(Fold_color)
  overflows_screen, x, y, pos, screen_line_starting_pos = Text.draw_wrapping_lineB(State, line_index, x+2*App.width(State.em),y, 1)
  if overflows_screen then
    return y, screen_line_starting_pos
  end
  if State.cursor1.posB then
    if State.search_term == nil then
      if line_index == State.cursor1.line and State.cursor1.posB == pos then
        Text.draw_cursor(State, x, y)

Replacement in text.lua at line 58 [6.1]
B:BD[12.949] → [12.949:986]
```
  return y, screen_line_starting_pos
```
[12.790]
[12.986]
```
  return y, nil, screen_line_starting_pos
```