akkartik/bf.love - Change R3KXFRZNL4CAT5OSKIIGWR3CHL2YJ5S4TKQDIPEHIJ2HW2WS46BQC

get rid of to_text

I've been misunderstanding what Text objects are. They can render a lot of text with a given line height, word wrap, colors in various places. And I've been creating one for every word :facepalm:

Unwinding this will take some time. This is just a first baby step for ad hoc text objects. Turns out I don't need to convert to Text to get something's rendered width, just the Font can do that.

Thanks to the LÖVE Discord for educating me: https://discord.com/channels/329400828920070144/330089431379869708/1091535487333826580

Created by Kartik K. Agaram on April 1, 2023

R3KXFRZNL4CAT5OSKIIGWR3CHL2YJ5S4TKQDIPEHIJ2HW2WS46BQC

Dependencies

In channels

main

Change contents

Replacement in source_text.lua at line 48 [7.83723]

B:BD[3.367] → [3.367:578]

          local filename_text = App.newText(love.graphics.getFont(), filename)
          button(State, 'link', {x=x+App.width(to_text('[[')), y=y, w=App.width(filename_text), h=State.line_height, color={1,1,1},

[3.367]

[3.578]

          button(State, 'link', {x=x+App.width('[['), y=y, w=App.width(filename), h=State.line_height, color={1,1,1},

Deletion in source.lua at line 419 [7.165766]

∅:D[6.4019] → [7.177474:177618]

B:BD[7.177474] → [7.177474:177618]

  end
end
-- use this sparingly
function to_text(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)

Deletion in source.lua at line 420 [7.165766]
B:BD[7.177624] → [7.177624:177647]
```
  return Text_cache[s]
```

Replacement in run.lua at line 200 [7.178044]

B:BD[7.183879] → [7.183879:184041]

-- use this sparingly
function to_text(s)
  if Text_cache[s] == nil then
    Text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  return Text_cache[s]

[7.183879]

[7.184041]

function width(s)
  return love.graphics.getFont():getWidth(s)

Deletion in log_browser.lua at line 101 [7.191782]
B:BD[7.195449] → [7.195449:195505]
```
        local section_text = to_text(line.section_name)
```

Replacement in log_browser.lua at line 106 [7.191782]

B:BD[7.195813] → [7.195813:195959]

          love.graphics.draw(section_text, xleft+50,y)
          love.graphics.line(xleft+50+App.width(section_text)+2,sectiony, xright,sectiony)

[7.195813]

[7.195959]

          love.graphics.print(line.section_name, xleft+50,y)
          love.graphics.line(xleft+50+App.width(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 113 [7.191782]

B:BD[7.196252] → [7.196252:196398]

          love.graphics.draw(section_text, xleft+50,y)
          love.graphics.line(xleft+50+App.width(section_text)+2,sectiony, xright,sectiony)

[7.196252]

[7.196398]

          love.graphics.print(line.section_name, xleft+50,y)
          love.graphics.line(xleft+50+App.width(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 150 [7.191782]

B:BD[7.197661] → [7.197661:197834]

      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-App.width(to_text(line.section_stack[i].name))-5, --[[vertically]] math.pi/2)

[7.197661]

[7.197834]

      love.graphics.print(line.section_stack[i].name, x+State.font_height+5, App.screen.height-App.width(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)

Replacement in log_browser.lua at line 165 [7.191782]

B:BD[7.198357] → [7.198357:198510]

      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(to_text(line.section_stack[i].name))-5, --[[vertically]] math.pi/2)

[7.198357]

[7.198510]

      love.graphics.print(line.section_stack[i].name, x, App.screen.height-App.width(line.section_stack[i].name)-5, --[[vertically]] math.pi/2)

Replacement in help.lua at line 150 [8.6622]
B:BD[8.11371] → [9.273:307]
```
  return App.width(to_text('* '))
```
[8.11371]
[8.11540]
```
  return App.width('* ')
```

Replacement in commands.lua at line 46 [7.204370]

B:BD[7.205905] → [10.29:91]

  local s_text = to_text(s)
  local width = App.width(s_text)

[7.205905]

[5.29]

  local width = App.width(s)

Replacement in commands.lua at line 51 [7.204370]
B:BD[7.206145] → [10.92:133]
```
  App.screen.draw(s_text, Menu_cursor,5)
```
[7.206145]
[7.206193]
```
  App.screen.print(s, Menu_cursor,5)
```

Replacement in commands.lua at line 57 [7.204370]

B:BD[11.227] → [11.227:363]

  local filter_text = to_text(File_navigation.filter)
  App.screen.draw(filter_text, 5, 5)
  draw_cursor(5 + App.width(filter_text), 5)

[11.227]

[12.29]

  App.screen.print(File_navigation.filter, 5, 5)
  draw_cursor(5 + App.width(File_navigation.filter), 5)

Replacement in commands.lua at line 98 [7.204370]
∅:D[4.404] → [13.29:76]
B:BD[12.565] → [13.29:76]
```
    local width = App.width(to_text(filename))
```
[4.404]
[13.76]
```
    local width = App.width(filename)
```
Replacement in commands.lua at line 110 [7.204370]
∅:D[12.808] → [10.134:196]
B:BD[7.206600] → [10.134:196]
```
  local s_text = to_text(s)
  local width = App.width(s_text)
```
[12.808]
[12.809]
```
  local width = App.width(s)
```
Replacement in commands.lua at line 125 [7.204370]
B:BD[7.207023] → [12.992:1023]
```
  App.screen.draw(s_text, x,y)
```
[7.207023]
[12.1023]
```
  App.screen.print(s, x,y)
```

Replacement in commands.lua at line 189 [7.204370]

B:BD[4.972] → [4.972:1053]

    local filename_text = to_text(filename)
    width = App.width(filename_text)

[4.972]

[4.1053]

    width = App.width(filename)

Replacement in commands.lua at line 206 [7.204370]

B:BD[4.1526] → [4.1526:1607]

    local filename_text = to_text(filename)
    width = App.width(filename_text)

[4.1526]

[4.1607]

    width = App.width(filename)

Replacement in commands.lua at line 217 [7.204370]

B:BD[4.1984] → [4.1984:2043]

      App.screen.draw(filename_text, x + x3-menu_xmin, y3)

[4.1984]

[4.2043]

      App.screen.print(filename, x + x3-menu_xmin, y3)

Replacement in commands.lua at line 244 [7.204370]
B:BD[14.863] → [14.863:910]
```
    local width = App.width(to_text(filename))
```
[14.863]
[14.910]
```
    local width = App.width(filename)
```
Replacement in commands.lua at line 262 [7.204370]
B:BD[14.1363] → [14.1363:1410]
```
    local width = App.width(to_text(filename))
```
[14.1363]
[14.1410]
```
    local width = App.width(filename)
```

Insertion in app.lua at line 222 [16.2]

[15.296]

  if type(text) == 'string' then
    return love.graphics.getFont():getWidth(text)
  end

Replacement in app.lua at line 431 [16.2]

B:BD[17.8106] → [17.8106:8162]

  App.width = function(text) return text:getWidth() end

[17.8106]

[2.31]

  App.width = function(text)
    if type(text) == 'string' then
      return love.graphics.getFont():getWidth(text)
    end
    return text:getWidth()
  end

get rid of to_text

Dependencies

In channels

Change contents

Replacement in source_text.lua at line 48 [7.83723]

Deletion in source.lua at line 419 [7.165766]

Deletion in source.lua at line 420 [7.165766]

Replacement in run.lua at line 200 [7.178044]

Deletion in log_browser.lua at line 101 [7.191782]

Replacement in log_browser.lua at line 106 [7.191782]

Replacement in log_browser.lua at line 113 [7.191782]

Replacement in log_browser.lua at line 150 [7.191782]

Replacement in log_browser.lua at line 165 [7.191782]

Replacement in help.lua at line 150 [8.6622]

Replacement in commands.lua at line 46 [7.204370]

Replacement in commands.lua at line 51 [7.204370]

Replacement in commands.lua at line 57 [7.204370]

Replacement in commands.lua at line 98 [7.204370]

Replacement in commands.lua at line 110 [7.204370]

Replacement in commands.lua at line 125 [7.204370]

Replacement in commands.lua at line 189 [7.204370]

Replacement in commands.lua at line 206 [7.204370]

Replacement in commands.lua at line 217 [7.204370]

Replacement in commands.lua at line 244 [7.204370]

Replacement in commands.lua at line 262 [7.204370]

Insertion in app.lua at line 222 [16.2]

Replacement in app.lua at line 431 [16.2]