akkartik/wardley.love - Change 2I6URQ573QKGO433M4J7GQOZZLW34BIGMDWDYLAZFTQBWKFW4QBQC

Merge text.love

Created by Kartik K. Agaram on March 23, 2023

2I6URQ573QKGO433M4J7GQOZZLW34BIGMDWDYLAZFTQBWKFW4QBQC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[4.2] → [5.165788:165827]

BFD:BFD[5.165827] → [5.152503:152503]

B:BD[7.25355] → [3.11:386]

∅:D[3.386] → [8.21189:21195]

  end
end
function edit.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    for i=1,math.floor(dy) do
      Text.up(State)
    end
  elseif dy < 0 then
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
    for i=1,math.floor(-dy) do
      Text.down(State)
    end
  end

File deletion: source.lua, source.lua

BFD:BFD[4.2] → [5.177715:177749]

BFD:BFD[5.177749] → [5.165829:165829]

B:BD[5.175825] → [3.388:666]

∅:D[3.666] → [9.7081:7111]

function source.mouse_wheel_move(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
    return edit.mouse_wheel_move(Editor_state, dx,dy)
  else
    return log_browser.mouse_wheel_move(Log_browser_state, dx,dy)
  end
end
function source.text_input(t)

File deletion: run.lua, run.lua
BFD:BFD[4.2] → [5.183867:183898]
BFD:BFD[4.2] → [5.183867:183898]
BFD:BFD[5.183898] → [5.178107:178107]
B:BD[5.183200] → [3.671:839]
∅:D[3.839] → [9.7796:7823]
```
function run.mouse_wheel_move(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  return edit.mouse_wheel_move(Editor_state, dx,dy)
end
function run.text_input(t)
```

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[4.2] → [5.202684:202723]

BFD:BFD[5.202723] → [5.191243:191243]

B:BD[5.201029] → [3.1448:1474]

B:BD[5.201250] → [3.1475:1503]

B:BD[5.202107] → [3.1504:1719]

B:BD[5.202126] → [3.1720:1948]

∅:D[3.1948] → [5.202126:202624]

∅:D[3.1719] → [5.202107:202126]

∅:D[3.1503] → [5.201452:202107]

∅:D[3.1474] → [5.201220:201250]

B:BD[9.8596] → [3.1211:1447]

∅:D[3.1447] → [5.200887:200892]

    log_browser.up(State)
    log_browser.down(State)
    end
  end
end
function log_browser.up(State)
  while State.screen_top1.line > 1 do
    State.screen_top1.line = State.screen_top1.line-1
    if should_show(State.lines[State.screen_top1.line]) then
      break
function log_browser.down(State)
  while State.screen_top1.line < #State.lines do
    State.screen_top1.line = State.screen_top1.line+1
    if should_show(State.lines[State.screen_top1.line]) then
      break
    end
  end
end
function log_browser.height(State, line_index)
  local line = State.lines[line_index]
  if line.data == nil then
    -- section header
    return State.line_height
  elseif type(line.data) == 'string' then
    return State.line_height
  else
    if line.height == nil then
--?       print('nil line height! rendering off screen to calculate')
      line.height = log_render[line.data.name](line.data, State.left, App.screen.height, State.right-State.left)
    end
    return line.height
  end
end
    end
  end
end
  elseif chord == 'pageup' then
    local y = 0
    while State.screen_top1.line > 1 and y < App.screen.height - 100 do
      State.screen_top1.line = State.screen_top1.line - 1
      if should_show(State.lines[State.screen_top1.line]) then
        y = y + log_browser.height(State, State.screen_top1.line)
      end
    end
  elseif chord == 'pagedown' then
    local y = 0
    while State.screen_top1.line < #State.lines and y < App.screen.height - 100 do
      if should_show(State.lines[State.screen_top1.line]) then
        y = y + log_browser.height(State, State.screen_top1.line)
      end
      State.screen_top1.line = State.screen_top1.line + 1
  elseif chord == 'down' then
end
function log_browser.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    for i=1,math.floor(dy) do
      log_browser.up(State)
    end
  elseif dy < 0 then
    for i=1,math.floor(-dy) do
      log_browser.down(State)
    end
  end
end

Insertion in main.lua at line 185 [11.2]

[10.7147]

function App.wheelmoved(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  return edit.mouse_wheel_move(Editor_state, dx,dy)
end

Deletion in main.lua at line 230 [11.2]
B:BD[12.268] → [13.9:9]
B:BD[12.102] → [3.1040:1071]
BD:BD[12.102] → [3.1040:1071]
B:BD[5.190461] → [3.1072:1137]
BD:BD[5.190461] → [3.1072:1137]
B:BD[14.355] → [3.842:842]
BD:BD[14.355] → [3.842:842]
BD:BD[14.355] → [3.842:842]
∅:D[3.842] → [15.823:894]
B:BD[16.5101] → [15.823:894]
BD:BD[16.5101] → [15.823:894]
B:BD[15.894] → [3.843:889]
BD:BD[15.894] → [3.843:889]
∅:D[3.889] → [15.925:956]
B:BD[15.925] → [15.925:956]
BD:BD[15.925] → [15.925:956]
BD:BD[15.925] → [15.925:956]
B:BD[15.956] → [3.890:961]
BD:BD[15.956] → [3.890:961]
BD:BD[15.956] → [3.890:961]
∅:D[3.961] → [15.1021:1059]
B:BD[15.1021] → [15.1021:1059]
BD:BD[15.1021] → [15.1021:1059]
BD:BD[15.1021] → [15.1021:1059]
B:BD[15.1059] → [3.962:1039]
BD:BD[15.1059] → [3.962:1039]
BD:BD[15.1059] → [3.962:1039]
```
function App.wheelmoved(dx,dy)
    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
function App.mousereleased(x,y, mouse_button)
  if Current_app == 'run' then
    if run.mouse_release then run.mouse_release(x,y, mouse_button) end
  elseif Current_app == 'source' then
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
```
Solving an order conflict in main.lua at line 230 [11.2]
[12.268]