akkartik/sokoban.love - Change ISOFHXB2DX6IRN4HVBYWLADZM7QXQKRNAAS577G542KS4L6G5H3QC

App.width can no longer take a Text

In the process I discovered the horrible fact that Text.x allocates a new Text. And it gets called (just once, thank goodness) on every single frame.

Created by Kartik K. Agaram on April 1, 2023

ISOFHXB2DX6IRN4HVBYWLADZM7QXQKRNAAS577G542KS4L6G5H3QC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 26 [6.1]

B:BD[2.28] → [2.28:74]

      local frag_width = App.width(frag_text)

[2.28]

[7.138]

      local frag_width = App.width(f.data)

Replacement in text.lua at line 93 [6.1]

B:BD[4.594] → [4.594:638]

    local frag_width = App.width(frag_text)

[4.594]

[4.638]

    local frag_width = App.width(f.data)

Replacement in text.lua at line 117 [6.1]

B:BD[8.747] → [9.2896:2940]

    local frag_width = App.width(frag_text)

[8.747]

[10.3]

    local frag_width = App.width(frag)

Replacement in text.lua at line 132 [6.1]

B:BD[11.800] → [11.800:850]

        local frag1_width = App.width(frag1_text)

[11.800]

[11.850]

        local frag1_width = App.width(frag1)

Replacement in text.lua at line 138 [6.1]

B:BD[11.1160] → [11.1160:1202]

        frag_width = App.width(frag_text)

[11.1160]

[12.1367]

        frag_width = App.width(frag)

Replacement in text.lua at line 762 [6.1]

B:BD[13.1530] → [13.1530:1644]

  local screen_line_text = App.newText(love.graphics.getFont(), screen_line)
  return App.width(screen_line_text)

[13.1530]

[14.1649]

  return App.width(screen_line)

Replacement in text.lua at line 850 [6.1]

B:BD[15.3817] → [15.3817:3918]

  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)

[15.3817]

[16.7876]

  return App.width(s_before)

Replacement in text.lua at line 856 [6.1]

B:BD[17.1333] → [17.1333:1434]

  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)

[17.1333]

[17.1434]

  return App.width(s_before)

Replacement in source_text.lua at line 29 [18.83723]
B:BD[18.87793] → [18.87793:87839]
```
      local frag_width = App.width(frag_text)
```
[18.87793]
[18.87839]
```
      local frag_width = App.width(f.data)
```
Replacement in source_text.lua at line 109 [18.83723]
B:BD[18.91878] → [18.91878:91922]
```
    local frag_width = App.width(frag_text)
```
[18.91878]
[18.91922]
```
    local frag_width = App.width(f.data)
```
Replacement in source_text.lua at line 133 [18.83723]
B:BD[18.92613] → [18.92613:92657]
```
    local frag_width = App.width(frag_text)
```
[18.92613]
[18.92657]
```
    local frag_width = App.width(frag)
```

Replacement in source_text.lua at line 148 [18.83723]

B:BD[18.93610] → [18.93610:93660]

        local frag1_width = App.width(frag1_text)

[18.93610]

[18.93660]

        local frag1_width = App.width(frag1)

Replacement in source_text.lua at line 154 [18.83723]
B:BD[18.93970] → [18.93970:94012]
```
        frag_width = App.width(frag_text)
```
[18.93970]
[18.94012]
```
        frag_width = App.width(frag)
```

Replacement in source_text.lua at line 778 [18.83723]

B:BD[18.135976] → [18.135976:136090]

  local screen_line_text = App.newText(love.graphics.getFont(), screen_line)
  return App.width(screen_line_text)

[18.135976]

[18.136090]

  return App.width(screen_line)

Replacement in source_text.lua at line 866 [18.83723]

B:BD[18.139549] → [18.139549:139650]

  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)

[18.139549]

[18.139650]

  return App.width(s_before)

Replacement in source_text.lua at line 872 [18.83723]

B:BD[18.139754] → [18.139754:139855]

  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)

[18.139754]

[18.139855]

  return App.width(s_before)

Replacement in source_select.lua at line 63 [19.23288]

B:BD[19.25854] → [19.25854:25962]

      local before_text = App.newText(love.graphics.getFont(), before)
      lo_px = App.width(before_text)

[19.25854]

[19.25962]

      lo_px = App.width(before)

Deletion in source_select.lua at line 67 [19.23288]

B:BD[19.26098] → [19.26098:26194]

    local text = App.newText(love.graphics.getFont(), s)
    local text_width = App.width(text)

Replacement in source_select.lua at line 68 [19.23288]

B:BD[19.26225] → [19.26225:26302]

    love.graphics.rectangle('fill', x+lo_px,y, text_width,State.line_height)

[19.26225]

[19.26302]

    love.graphics.rectangle('fill', x+lo_px,y, App.width(s),State.line_height)

Deletion in source_edit.lua at line 107 [18.152440]
B:BD[18.155208] → [18.155208:155231]
```
    search_text = nil,
```
Deletion in source_edit.lua at line 327 [18.152440]
B:BD[18.157970] → [18.157970:157998]
```
    State.search_text = nil
```
Deletion in source_edit.lua at line 357 [18.152440]
B:BD[18.158234] → [18.158234:158264]
```
      State.search_text = nil
```
Deletion in source_edit.lua at line 363 [18.152440]
B:BD[18.158563] → [18.158563:158593]
```
      State.search_text = nil
```
Deletion in source_edit.lua at line 368 [18.152440]
B:BD[18.158844] → [18.158844:158874]
```
      State.search_text = nil
```
Deletion in source_edit.lua at line 381 [18.152440]
B:BD[18.159452] → [18.159452:159489]
```
    assert(State.search_text == nil)
```
Deletion in source_edit.lua at line 512 [18.152440]
B:BD[18.164115] → [18.164115:164170]
```
  State.em = App.newText(love.graphics.getFont(), 'm')
```

Replacement in source.lua at line 165 [18.165766]

B:BD[18.170082] → [18.170082:170188]

  local em = App.newText(love.graphics.getFont(), 'm')
  source.initialize_window_geometry(App.width(em))

[18.170082]

[18.170188]

  source.initialize_window_geometry(App.width('m'))

Deletion in source.lua at line 170 [18.165766]
B:BD[18.170381] → [18.170381:170404]
```
  Editor_state.em = em
```

Replacement in select.lua at line 61 [21.43980]

B:BD[20.514] → [20.514:622]

      local before_text = App.newText(love.graphics.getFont(), before)
      lo_px = App.width(before_text)

[20.514]

[20.622]

      lo_px = App.width(before)

Deletion in select.lua at line 65 [21.43980]

B:BD[20.758] → [20.758:854]

    local text = App.newText(love.graphics.getFont(), s)
    local text_width = App.width(text)

Replacement in select.lua at line 66 [21.43980]

B:BD[22.152] → [23.939:1016]

    love.graphics.rectangle('fill', x+lo_px,y, text_width,State.line_height)

[22.152]

[22.153]

    love.graphics.rectangle('fill', x+lo_px,y, App.width(s),State.line_height)

Replacement in search.lua at line 16 [21.48846]

B:BD[22.232] → [24.1672:1787]

∅:D[24.1787] → [21.49593:49599]

∅:D[25.82027] → [21.49593:49599]

B:BD[21.49593] → [21.49593:49599]

B:BD[21.49599] → [3.6:69]

  if State.search_text == nil then
    State.search_text = App.newText(love.graphics.getFont(), State.search_term)
  end
  Text.draw_cursor(State, 25+App.width(State.search_text),y-5)

[24.1671]

[21.49698]

  Text.draw_cursor(State, 25+App.width(State.search_term),y-5)

Replacement in run.lua at line 74 [18.178044]

B:BD[18.180430] → [18.180430:180533]

  local em = App.newText(love.graphics.getFont(), 'm')
  run.initialize_window_geometry(App.width(em))

[18.180430]

[18.180533]

  run.initialize_window_geometry(App.width('m'))

Deletion in run.lua at line 78 [18.178044]
B:BD[18.180726] → [18.180726:180749]
```
  Editor_state.em = em
```
Deletion in edit.lua at line 106 [26.413]
B:BD[25.97772] → [25.97772:97795]
```
    search_text = nil,
```
Deletion in edit.lua at line 326 [26.413]
B:BD[27.6467] → [27.6467:6495]
```
    State.search_text = nil
```
Deletion in edit.lua at line 356 [26.413]
B:BD[27.7016] → [27.7016:7046]
```
      State.search_text = nil
```
Deletion in edit.lua at line 362 [26.413]
B:BD[27.7215] → [27.7215:7245]
```
      State.search_text = nil
```
Deletion in edit.lua at line 367 [26.413]
B:BD[27.7460] → [27.7460:7490]
```
      State.search_text = nil
```
Deletion in edit.lua at line 380 [26.413]
∅:D[10.25412] → [27.7718:7755]
B:BD[27.7718] → [27.7718:7755]
```
    assert(State.search_text == nil)
```
Deletion in edit.lua at line 511 [26.413]
B:BD[28.387] → [28.387:442]
```
  State.em = App.newText(love.graphics.getFont(), 'm')
```
Replacement in drawing.lua at line 63 [30.98]
∅:D[22.1244] → [29.347:373]
B:BD[29.347] → [29.347:373]
B:BD[29.373] → [31.94:157]
```
          local name_text
          -- TODO: avoid computing name width on every repaint
```
[22.1244]
[29.373]
```
          local name_width
```

Replacement in drawing.lua at line 65 [30.98]

B:BD[29.404] → [32.1082:1115]

            name_text = State.em

[29.404]

[29.488]

            name_width = App.width('m')

Replacement in drawing.lua at line 67 [30.98]

B:BD[29.503] → [33.86:155]

            name_text = App.newText(love.graphics.getFont(), p.name)

[29.503]

[29.582]

            name_width = App.width(p.name)

Replacement in drawing.lua at line 69 [30.98]

B:BD[29.596] → [32.1116:1204]

          love.graphics.rectangle('fill', x,y, App.width(name_text), State.line_height)

[29.596]

[29.703]

          love.graphics.rectangle('fill', x,y, name_width, State.line_height)

Replacement in app.lua at line 222 [34.2]

B:BD[33.296] → [5.1339:1428]

∅:D[5.1428] → [33.296:326]

B:BD[33.296] → [33.296:326]

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

[33.296]

[35.6717]

  return love.graphics.getFont():getWidth(text)

Deletion in app.lua at line 428 [34.2]

B:BD[35.8106] → [5.1429:1586]

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

App.width can no longer take a Text

Dependencies

In channels

Change contents

Replacement in text.lua at line 26 [6.1]

Replacement in text.lua at line 93 [6.1]

Replacement in text.lua at line 117 [6.1]

Replacement in text.lua at line 132 [6.1]

Replacement in text.lua at line 138 [6.1]

Replacement in text.lua at line 762 [6.1]

Replacement in text.lua at line 850 [6.1]

Replacement in text.lua at line 856 [6.1]

Replacement in source_text.lua at line 29 [18.83723]

Replacement in source_text.lua at line 109 [18.83723]

Replacement in source_text.lua at line 133 [18.83723]

Replacement in source_text.lua at line 148 [18.83723]

Replacement in source_text.lua at line 154 [18.83723]

Replacement in source_text.lua at line 778 [18.83723]

Replacement in source_text.lua at line 866 [18.83723]

Replacement in source_text.lua at line 872 [18.83723]

Replacement in source_select.lua at line 63 [19.23288]

Deletion in source_select.lua at line 67 [19.23288]

Replacement in source_select.lua at line 68 [19.23288]

Deletion in source_edit.lua at line 107 [18.152440]

Deletion in source_edit.lua at line 327 [18.152440]

Deletion in source_edit.lua at line 357 [18.152440]

Deletion in source_edit.lua at line 363 [18.152440]

Deletion in source_edit.lua at line 368 [18.152440]

Deletion in source_edit.lua at line 381 [18.152440]

Deletion in source_edit.lua at line 512 [18.152440]

Replacement in source.lua at line 165 [18.165766]

Deletion in source.lua at line 170 [18.165766]

Replacement in select.lua at line 61 [21.43980]

Deletion in select.lua at line 65 [21.43980]

Replacement in select.lua at line 66 [21.43980]

Replacement in search.lua at line 16 [21.48846]

Replacement in run.lua at line 74 [18.178044]

Deletion in run.lua at line 78 [18.178044]

Deletion in edit.lua at line 106 [26.413]

Deletion in edit.lua at line 326 [26.413]

Deletion in edit.lua at line 356 [26.413]

Deletion in edit.lua at line 362 [26.413]

Deletion in edit.lua at line 367 [26.413]

Deletion in edit.lua at line 380 [26.413]

Deletion in edit.lua at line 511 [26.413]

Replacement in drawing.lua at line 63 [30.98]

Replacement in drawing.lua at line 65 [30.98]

Replacement in drawing.lua at line 67 [30.98]

Replacement in drawing.lua at line 69 [30.98]

Replacement in app.lua at line 222 [34.2]

Deletion in app.lua at line 428 [34.2]