akkartik/view.love - Change AQMZJXUR5NFNATJ4LPTVGVLQFIKRKRSPYAICXWHGQCQ4WLMQ2JTQC

use editor state font for width calculations

Created by akkartik on January 12, 2024

AQMZJXUR5NFNATJ4LPTVGVLQFIKRKRSPYAICXWHGQCQ4WLMQ2JTQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 44 [11.1]

B:BD[4.169] → [4.169:265]

            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[4.169]

[4.265]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in text.lua at line 49 [11.1]

∅:D[12.232] → [13.243:339]

∅:D[4.571] → [13.243:339]

B:BD[14.869] → [13.243:339]

            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[4.571]

[15.530]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in text.lua at line 98 [11.1]

B:BD[16.747] → [17.89:128]

    local frag_width = App.width(frag)

[18.168]

[19.1613]

    local frag_width = State.font:getWidth(frag)

Replacement in text.lua at line 105 [11.1]

B:BD[20.331] → [19.1821:1892]

        local bpos = Text.nearest_pos_less_than(frag, State.width - x)

[20.331]

[8.0]

        local bpos = Text.nearest_pos_less_than(State.font, frag, State.width - x)

Replacement in text.lua at line 115 [11.1]
∅:D[19.2074] → [17.175:212]
B:BD[20.1160] → [17.175:212]
```
        frag_width = App.width(frag)
```
[19.2074]
[18.1367]
```
        frag_width = State.font:getWidth(frag)
```

Replacement in text.lua at line 422 [11.1]

B:BD[21.4882] → [22.1024:1138]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[21.4882]

[23.1691]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in text.lua at line 432 [11.1]

B:BD[21.5703] → [22.1139:1253]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[21.5703]

[21.5811]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in text.lua at line 457 [11.1]

B:BD[24.537] → [24.537:641]

          pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),

[24.537]

[24.641]

          pos = Text.nearest_cursor_pos(State.font, State.lines[new_cursor_line].data, State.cursor_x, State.left),

Replacement in text.lua at line 479 [11.1]

B:BD[21.7111] → [22.1606:1720]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[21.7111]

[21.7219]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in text.lua at line 742 [11.1]

B:BD[25.1751] → [22.3151:3393]

--?       print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1

[25.1751]

[26.1279]

--?       print('return', mx, Text.nearest_cursor_pos(State.font, s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1

Replacement in text.lua at line 763 [11.1]
B:BD[27.1530] → [17.213:245]
```
  return App.width(screen_line)
```
[27.1530]
[28.1649]
```
  return State.font:getWidth(screen_line)
```
Replacement in text.lua at line 777 [11.1]
∅:D[2.25] → [29.670:718]
B:BD[29.670] → [29.670:718]
```
function Text.nearest_cursor_pos(line, x, left)
```
[2.25]
[30.956]
```
function Text.nearest_cursor_pos(font, line, x, left)
```

Replacement in text.lua at line 782 [11.1]

B:BD[31.383] → [29.719:760]

  local max_x = left+Text.x(line, len+1)

[31.383]

[11.598]

  local max_x = left+Text.x(font, line, len+1)

Replacement in text.lua at line 794 [11.1]

B:BD[32.208] → [29.761:853]

    local currxmin = left+Text.x(line, curr)
    local currxmax = left+Text.x(line, curr+1)

[32.208]

[32.209]

    local currxmin = left+Text.x(font, line, curr)
    local currxmax = left+Text.x(font, line, curr+1)

Replacement in text.lua at line 819 [11.1]
∅:D[2.48] → [33.3424:3469]
B:BD[33.3424] → [33.3424:3469]
```
function Text.nearest_pos_less_than(line, x)
```
[2.48]
[34.619]
```
function Text.nearest_pos_less_than(font, line, x)
```
Replacement in text.lua at line 822 [11.1]
B:BD[35.7300] → [36.1065:1105]
```
  local max_x = Text.x_after(line, len)
```
[35.7300]
[35.7344]
```
  local max_x = Text.x_after(font, line, len)
```

Replacement in text.lua at line 829 [11.1]

B:BD[35.7496] → [36.1106:1202]

    local currxmin = Text.x_after(line, curr+1)
    local currxmax = Text.x_after(line, curr+2)

[35.7496]

[34.673]

    local currxmin = Text.x_after(font, line, curr+1)
    local currxmax = Text.x_after(font, line, curr+2)

Replacement in text.lua at line 847 [11.1]
B:BD[33.3662] → [36.1203:1233]
```
function Text.x_after(s, pos)
```
[33.3662]
[9.4]
```
function Text.x_after(font, s, pos)
```
Replacement in text.lua at line 852 [11.1]
B:BD[33.3817] → [17.246:275]
```
  return App.width(s_before)
```
[33.3817]
[35.7876]
```
  return font:getWidth(s_before)
```
Replacement in text.lua at line 855 [11.1]
B:BD[35.7881] → [36.1234:1258]
```
function Text.x(s, pos)
```
[35.7881]
[36.1258]
```
function Text.x(font, s, pos)
```
Replacement in text.lua at line 858 [11.1]
B:BD[36.1333] → [17.276:305]
```
  return App.width(s_before)
```
[36.1333]
[36.1434]
```
  return font:getWidth(s_before)
```

Replacement in source_text.lua at line 17 [37.83723]

B:BD[6.153] → [6.153:239]

    love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)

[6.153]

[6.239]

    love.graphics.print(line_index, State.left-Line_number_width*State.font:getWidth('m')+10,y)

Replacement in source_text.lua at line 35 [37.83723]

B:BD[38.764] → [38.764:850]

        local lo, hi = Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)

[38.764]

[38.850]

        local lo, hi = Text.clip_wikiword_with_screen_line(State.font, line, line_cache, i, s, e)

Replacement in source_text.lua at line 65 [37.83723]

B:BD[4.741] → [4.741:837]

            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[4.741]

[4.837]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in source_text.lua at line 70 [37.83723]

∅:D[12.488] → [13.626:722]

∅:D[4.1143] → [13.626:722]

B:BD[37.88889] → [13.626:722]

            Text.draw_cursor(State, State.left+Text.x(screen_line, State.cursor1.pos-pos+1), y)

[4.1143]

[37.89003]

            Text.draw_cursor(State, State.left+Text.x(State.font, screen_line, State.cursor1.pos-pos+1), y)

Replacement in source_text.lua at line 79 [37.83723]
B:BD[5.537] → [5.537:567]
```
        x = x+App.width(frag)
```
[5.537]
[37.89029]
```
        x = x+State.font:getWidth(frag)
```
Replacement in source_text.lua at line 123 [37.83723]
B:BD[38.2472] → [38.2472:2511]
```
    local frag_width = App.width(frag)
```
[38.2472]
[38.2511]
```
    local frag_width = State.font:getWidth(frag)
```

Replacement in source_text.lua at line 130 [37.83723]

B:BD[38.2815] → [38.2815:2886]

        local bpos = Text.nearest_pos_less_than(frag, State.width - x)

[38.2815]

[8.193]

        local bpos = Text.nearest_pos_less_than(State.font, frag, State.width - x)

Replacement in source_text.lua at line 140 [37.83723]
B:BD[38.3180] → [38.3180:3217]
```
        frag_width = App.width(frag)
```
[38.3180]
[38.3217]
```
        frag_width = State.font:getWidth(frag)
```

Replacement in source_text.lua at line 175 [37.83723]

B:BD[38.3993] → [38.3993:4065]

function Text.clip_wikiword_with_screen_line(line, line_cache, i, s, e)

[38.3993]

[38.4065]

function Text.clip_wikiword_with_screen_line(font, line, line_cache, i, s, e)

Replacement in source_text.lua at line 197 [37.83723]

B:BD[38.4555] → [3.7:93]

  return App.width(line.data:sub(soff, loff-1)), App.width(line.data:sub(soff, hoff))

[38.4555]

[37.94273]

  return font:getWidth(line.data:sub(soff, loff-1)), font:getWidth(line.data:sub(soff, hoff))

Replacement in source_text.lua at line 484 [37.83723]

B:BD[24.7881] → [24.7881:7995]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[24.7881]

[24.7995]

        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in source_text.lua at line 494 [37.83723]

B:BD[37.110929] → [37.110929:111043]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[37.110929]

[37.111043]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in source_text.lua at line 519 [37.83723]

B:BD[24.9229] → [24.9229:9333]

          pos = Text.nearest_cursor_pos(State.lines[new_cursor_line].data, State.cursor_x, State.left),

[24.9229]

[24.9333]

          pos = Text.nearest_cursor_pos(State.font, State.lines[new_cursor_line].data, State.cursor_x, State.left),

Replacement in source_text.lua at line 541 [37.83723]

B:BD[37.116648] → [37.116648:116762]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1

[37.116648]

[37.116762]

    State.cursor1.pos = new_screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, State.cursor_x, State.left) - 1

Replacement in source_text.lua at line 804 [37.83723]

B:BD[39.5140] → [39.5140:5382]

--?       print('return', mx, Text.nearest_cursor_pos(s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(s, mx, State.left) - 1

[39.5140]

[37.135329]

--?       print('return', mx, Text.nearest_cursor_pos(State.font, s, mx, State.left), '=>', screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1)
      return screen_line_starting_pos + Text.nearest_cursor_pos(State.font, s, mx, State.left) - 1

Replacement in source_text.lua at line 825 [37.83723]
B:BD[37.135976] → [17.520:552]
```
  return App.width(screen_line)
```
[37.135976]
[37.136090]
```
  return State.font:getWidth(screen_line)
```
Replacement in source_text.lua at line 839 [37.83723]
B:BD[37.137622] → [37.137622:137670]
```
function Text.nearest_cursor_pos(line, x, left)
```
[37.137622]
[37.137670]
```
function Text.nearest_cursor_pos(font, line, x, left)
```
Replacement in source_text.lua at line 844 [37.83723]
B:BD[37.137737] → [37.137737:137778]
```
  local max_x = left+Text.x(line, len+1)
```
[37.137737]
[37.137778]
```
  local max_x = left+Text.x(font, line, len+1)
```

Replacement in source_text.lua at line 856 [37.83723]

B:BD[37.138077] → [37.138077:138169]

    local currxmin = left+Text.x(line, curr)
    local currxmax = left+Text.x(line, curr+1)

[37.138077]

[37.138169]

    local currxmin = left+Text.x(font, line, curr)
    local currxmax = left+Text.x(font, line, curr+1)

Replacement in source_text.lua at line 881 [37.83723]
B:BD[37.138708] → [37.138708:138753]
```
function Text.nearest_pos_less_than(line, x)
```
[37.138708]
[37.138753]
```
function Text.nearest_pos_less_than(font, line, x)
```
Replacement in source_text.lua at line 884 [37.83723]
B:BD[37.138835] → [37.138835:138875]
```
  local max_x = Text.x_after(line, len)
```
[37.138835]
[37.138875]
```
  local max_x = Text.x_after(font, line, len)
```

Replacement in source_text.lua at line 891 [37.83723]

B:BD[37.139009] → [37.139009:139105]

    local currxmin = Text.x_after(line, curr+1)
    local currxmax = Text.x_after(line, curr+2)

[37.139009]

[37.139105]

    local currxmin = Text.x_after(font, line, curr+1)
    local currxmax = Text.x_after(font, line, curr+2)

Replacement in source_text.lua at line 909 [37.83723]
B:BD[37.139394] → [37.139394:139424]
```
function Text.x_after(s, pos)
```
[37.139394]
[9.91]
```
function Text.x_after(font, s, pos)
```
Replacement in source_text.lua at line 914 [37.83723]
B:BD[37.139549] → [17.553:582]
```
  return App.width(s_before)
```
[37.139549]
[37.139650]
```
  return font:getWidth(s_before)
```
Replacement in source_text.lua at line 917 [37.83723]
B:BD[37.139655] → [37.139655:139679]
```
function Text.x(s, pos)
```
[37.139655]
[37.139679]
```
function Text.x(font, s, pos)
```
Replacement in source_text.lua at line 920 [37.83723]
B:BD[37.139754] → [17.583:612]
```
  return App.width(s_before)
```
[37.139754]
[37.139855]
```
  return font:getWidth(s_before)
```
Replacement in source_select.lua at line 60 [40.23288]
B:BD[40.25854] → [17.615:647]
```
      lo_px = App.width(before)
```
[40.25854]
[40.25962]
```
      lo_px = State.font:getWidth(before)
```

Replacement in source_select.lua at line 64 [40.23288]

B:BD[40.26225] → [17.648:727]

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

[40.26225]

[40.26302]

    love.graphics.rectangle('fill', x+lo_px,y, State.font:getWidth(s),State.line_height)

Replacement in source.lua at line 129 [37.165766]

B:BD[37.169468] → [10.45:217]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))

[37.169468]

[37.169599]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*font:getWidth('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))

Replacement in source.lua at line 157 [37.165766]

B:BD[41.51] → [42.304:482]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))

[41.51]

[43.115]

  Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*font:getWidth('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))

Replacement in select.lua at line 60 [45.43980]
B:BD[44.514] → [17.785:817]
```
      lo_px = App.width(before)
```
[44.514]
[44.622]
```
      lo_px = State.font:getWidth(before)
```

Replacement in select.lua at line 64 [45.43980]

B:BD[46.152] → [17.818:897]

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

[46.152]

[46.153]

    love.graphics.rectangle('fill', x+lo_px,y, State.font:getWidth(s),State.line_height)

Replacement in search.lua at line 16 [45.48846]

B:BD[47.1671] → [17.899:962]

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

[47.1671]

[45.49698]

  Text.draw_cursor(State, 25+State.font:getWidth(State.search_term),y-5)

Replacement in log_browser.lua at line 97 [37.191782]

B:BD[48.262] → [48.262:358]

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

[48.262]

[7.6565]

          love.graphics.line(xleft+50+State.font:getWidth(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 104 [37.191782]

B:BD[48.420] → [48.420:516]

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

[48.420]

[37.196398]

          love.graphics.line(xleft+50+State.font:getWidth(line.section_name)+2,sectiony, xright,sectiony)

Replacement in log_browser.lua at line 140 [37.191782]

B:BD[37.197661] → [48.517:681]

      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)

[37.197661]

[37.197834]

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

Replacement in log_browser.lua at line 155 [37.191782]

B:BD[37.198357] → [48.682:826]

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

[37.198357]

[37.198510]

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

Replacement in help.lua at line 12 [51.6622]

B:BD[49.460] → [50.18665:18762]

  love.graphics.print("then press the mouse button to drop it", State.left+30+bullet_indent(),y)

[49.460]

[49.564]

  love.graphics.print("then press the mouse button to drop it", State.left+30+State.font:getWidth('* '),y)

Deletion in help.lua at line 147 [51.6622]
B:BD[51.11320] → [51.11320:11325]
B:BD[51.11346] → [51.11346:11371]
B:BD[51.11371] → [48.832:857]
```
end
function bullet_indent()
  return App.width('* ')
```

Replacement in drawing.lua at line 64 [53.98]

B:BD[52.404] → [17.1055:1095]

            name_width = App.width('m')

[52.404]

[52.488]

            name_width = State.font:getWidth('m')

Replacement in drawing.lua at line 66 [53.98]

B:BD[52.503] → [17.1096:1139]

            name_width = App.width(p.name)

[52.503]

[52.582]

            name_width = State.font:getWidth(p.name)

use editor state font for width calculations

Dependencies

In channels

Change contents

Replacement in text.lua at line 44 [11.1]

Replacement in text.lua at line 49 [11.1]

Replacement in text.lua at line 98 [11.1]

Replacement in text.lua at line 105 [11.1]

Replacement in text.lua at line 115 [11.1]

Replacement in text.lua at line 422 [11.1]

Replacement in text.lua at line 432 [11.1]

Replacement in text.lua at line 457 [11.1]

Replacement in text.lua at line 479 [11.1]

Replacement in text.lua at line 742 [11.1]

Replacement in text.lua at line 763 [11.1]

Replacement in text.lua at line 777 [11.1]

Replacement in text.lua at line 782 [11.1]

Replacement in text.lua at line 794 [11.1]

Replacement in text.lua at line 819 [11.1]

Replacement in text.lua at line 822 [11.1]

Replacement in text.lua at line 829 [11.1]

Replacement in text.lua at line 847 [11.1]

Replacement in text.lua at line 852 [11.1]

Replacement in text.lua at line 855 [11.1]

Replacement in text.lua at line 858 [11.1]

Replacement in source_text.lua at line 17 [37.83723]

Replacement in source_text.lua at line 35 [37.83723]

Replacement in source_text.lua at line 65 [37.83723]

Replacement in source_text.lua at line 70 [37.83723]

Replacement in source_text.lua at line 79 [37.83723]

Replacement in source_text.lua at line 123 [37.83723]

Replacement in source_text.lua at line 130 [37.83723]

Replacement in source_text.lua at line 140 [37.83723]

Replacement in source_text.lua at line 175 [37.83723]

Replacement in source_text.lua at line 197 [37.83723]

Replacement in source_text.lua at line 484 [37.83723]

Replacement in source_text.lua at line 494 [37.83723]

Replacement in source_text.lua at line 519 [37.83723]

Replacement in source_text.lua at line 541 [37.83723]

Replacement in source_text.lua at line 804 [37.83723]

Replacement in source_text.lua at line 825 [37.83723]

Replacement in source_text.lua at line 839 [37.83723]

Replacement in source_text.lua at line 844 [37.83723]

Replacement in source_text.lua at line 856 [37.83723]

Replacement in source_text.lua at line 881 [37.83723]

Replacement in source_text.lua at line 884 [37.83723]

Replacement in source_text.lua at line 891 [37.83723]

Replacement in source_text.lua at line 909 [37.83723]

Replacement in source_text.lua at line 914 [37.83723]

Replacement in source_text.lua at line 917 [37.83723]

Replacement in source_text.lua at line 920 [37.83723]

Replacement in source_select.lua at line 60 [40.23288]