akkartik/wardley.love - Change 23MA4T3GWPOLM5S6JCNQJU2SRT7VQGYZ2JZJN26KA5MKI4LOCC4QC

add state arg to Drawing.keychord_pressed

Created by Kartik K. Agaram on July 13, 2022

23MA4T3GWPOLM5S6JCNQJU2SRT7VQGYZ2JZJN26KA5MKI4LOCC4QC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 405 [3.413]

B:BD[3.14724] → [3.14724:14762]

      Drawing.keychord_pressed(chord)

[3.14724]

[3.14762]

      Drawing.keychord_pressed(State, chord)

Replacement in drawing.lua at line 375 [6.98]
B:BD[4.19077] → [5.5217:5258]
```
function Drawing.keychord_pressed(chord)
```
[4.19077]
[7.1614]
```
function Drawing.keychord_pressed(State, chord)
```

Replacement in drawing.lua at line 377 [6.98]

B:BD[7.1665] → [2.131706:131757]

    Editor_state.current_drawing_mode = 'freehand'

[7.1665]

[8.15]

    State.current_drawing_mode = 'freehand'

Replacement in drawing.lua at line 379 [6.98]

B:BD[8.64] → [2.131758:131805]

    Editor_state.current_drawing_mode = 'line'

[8.64]

[8.98]

    State.current_drawing_mode = 'line'

Replacement in drawing.lua at line 390 [6.98]

B:BD[8.724] → [2.131806:131853]

    Editor_state.current_drawing_mode = 'line'

[8.724]

[8.758]

    State.current_drawing_mode = 'line'

Replacement in drawing.lua at line 392 [6.98]

B:BD[8.807] → [2.131854:131906]

    Editor_state.current_drawing_mode = 'manhattan'

[8.807]

[8.846]

    State.current_drawing_mode = 'manhattan'

Replacement in drawing.lua at line 405 [6.98]

B:BD[8.1550] → [2.131907:131959]

    Editor_state.current_drawing_mode = 'manhattan'

[8.1550]

[7.1666]

    State.current_drawing_mode = 'manhattan'

Replacement in drawing.lua at line 407 [6.98]

B:BD[7.1721] → [2.131960:132010]

    Editor_state.current_drawing_mode = 'polygon'

[7.1721]

[7.1722]

    State.current_drawing_mode = 'polygon'

Replacement in drawing.lua at line 409 [6.98]

B:BD[7.1771] → [2.132011:132061]

    Editor_state.current_drawing_mode = 'polygon'

[7.1771]

[9.16]

    State.current_drawing_mode = 'polygon'

Replacement in drawing.lua at line 424 [6.98]

B:BD[7.1827] → [2.132062:132114]

    Editor_state.current_drawing_mode = 'rectangle'

[7.1827]

[7.1828]

    State.current_drawing_mode = 'rectangle'

Replacement in drawing.lua at line 426 [6.98]

B:BD[7.1877] → [2.132115:132167]

    Editor_state.current_drawing_mode = 'rectangle'

[7.1877]

[9.65]

    State.current_drawing_mode = 'rectangle'

Replacement in drawing.lua at line 441 [6.98]

B:BD[7.1933] → [2.132168:132217]

    Editor_state.current_drawing_mode = 'square'

[7.1933]

[7.1934]

    State.current_drawing_mode = 'square'

Replacement in drawing.lua at line 443 [6.98]

B:BD[7.1983] → [2.132218:132267]

    Editor_state.current_drawing_mode = 'square'

[7.1983]

[9.114]

    State.current_drawing_mode = 'square'

Replacement in drawing.lua at line 461 [6.98]

B:BD[10.7998] → [2.132268:132368]

  elseif App.mouse_down(1) and chord == 'p' and Editor_state.current_drawing_mode == 'polygon' then

[10.7998]

[11.9508]

  elseif App.mouse_down(1) and chord == 'p' and State.current_drawing_mode == 'polygon' then

Replacement in drawing.lua at line 463 [6.98]

B:BD[11.9556] → [2.132369:132481]

    local mx,my = Drawing.coord(App.mouse_x()-Editor_state.margin_left), Drawing.coord(App.mouse_y()-drawing.y)

[11.9556]

[11.9655]

    local mx,my = Drawing.coord(App.mouse_x()-State.margin_left), Drawing.coord(App.mouse_y()-drawing.y)

Replacement in drawing.lua at line 466 [6.98]

B:BD[11.9759] → [2.132482:132635]

  elseif App.mouse_down(1) and chord == 'p' and (Editor_state.current_drawing_mode == 'rectangle' or Editor_state.current_drawing_mode == 'square') then

[11.9759]

[9.163]

  elseif App.mouse_down(1) and chord == 'p' and (State.current_drawing_mode == 'rectangle' or State.current_drawing_mode == 'square') then

Replacement in drawing.lua at line 468 [6.98]

B:BD[9.211] → [2.132636:132748]

    local mx,my = Drawing.coord(App.mouse_x()-Editor_state.margin_left), Drawing.coord(App.mouse_y()-drawing.y)

[9.211]

[5.6888]

    local mx,my = Drawing.coord(App.mouse_x()-State.margin_left), Drawing.coord(App.mouse_y()-drawing.y)

Replacement in drawing.lua at line 475 [6.98]

B:BD[7.2204] → [2.132749:132897]

    Editor_state.current_drawing_mode = 'circle'
  elseif App.mouse_down(1) and chord == 'a' and Editor_state.current_drawing_mode == 'circle' then

[7.2204]

[9.212]

    State.current_drawing_mode = 'circle'
  elseif App.mouse_down(1) and chord == 'a' and State.current_drawing_mode == 'circle' then

Replacement in drawing.lua at line 479 [6.98]

B:BD[5.7258] → [2.132898:133010]

    local mx,my = Drawing.coord(App.mouse_x()-Editor_state.margin_left), Drawing.coord(App.mouse_y()-drawing.y)

[5.7258]

[5.7414]

    local mx,my = Drawing.coord(App.mouse_x()-State.margin_left), Drawing.coord(App.mouse_y()-drawing.y)

Replacement in drawing.lua at line 484 [6.98]

B:BD[7.2341] → [2.133011:133060]

    Editor_state.current_drawing_mode = 'circle'

[7.2341]

[9.261]

    State.current_drawing_mode = 'circle'

Replacement in drawing.lua at line 497 [6.98]

B:BD[5.10172] → [2.133061:133196]

      if Editor_state.previous_drawing_mode == nil then
        Editor_state.previous_drawing_mode = Editor_state.current_drawing_mode

[5.10172]

[12.107]

      if State.previous_drawing_mode == nil then
        State.previous_drawing_mode = State.current_drawing_mode

Replacement in drawing.lua at line 500 [6.98]

B:BD[12.117] → [2.133197:133463]

      Editor_state.current_drawing_mode = 'move'
      drawing.pending = {mode=Editor_state.current_drawing_mode, target_point=p, target_point_index=i}
      Editor_state.lines.current_drawing_index = drawing_index
      Editor_state.lines.current_drawing = drawing

[12.117]

[5.10357]

      State.current_drawing_mode = 'move'
      drawing.pending = {mode=State.current_drawing_mode, target_point=p, target_point_index=i}
      State.lines.current_drawing_index = drawing_index
      State.lines.current_drawing = drawing

Replacement in drawing.lua at line 508 [6.98]

B:BD[13.1972] → [2.133464:133520]

      if Editor_state.previous_drawing_mode == nil then

[13.1972]

[12.268]

      if State.previous_drawing_mode == nil then

Replacement in drawing.lua at line 510 [6.98]

B:BD[12.293] → [2.133521:133600]

        Editor_state.previous_drawing_mode = Editor_state.current_drawing_mode

[12.293]

[12.346]

        State.previous_drawing_mode = State.current_drawing_mode

Replacement in drawing.lua at line 512 [6.98]

B:BD[12.356] → [2.133601:133650]

      Editor_state.current_drawing_mode = 'name'

[12.356]

[13.2059]

      State.current_drawing_mode = 'name'

Replacement in drawing.lua at line 514 [6.98]

B:BD[13.2077] → [2.133651:133856]

      drawing.pending = {mode=Editor_state.current_drawing_mode, target_point=point_index}
      Editor_state.lines.current_drawing_index = drawing_index
      Editor_state.lines.current_drawing = drawing

[13.2077]

[5.10680]

      drawing.pending = {mode=State.current_drawing_mode, target_point=point_index}
      State.lines.current_drawing_index = drawing_index
      State.lines.current_drawing = drawing