switch to line index in a function

- Text.to_pos_on_line
This commit is contained in:
Kartik K. Agaram 2022-07-17 09:19:53 -07:00
parent 6b3ddc816f
commit 2859063d9d
3 changed files with 6 additions and 6 deletions

View File

@ -215,7 +215,7 @@ function edit.mouse_pressed(State, x,y, mouse_button)
State.mousepress_shift = App.shift_down()
State.selection1 = {
line=line_index,
pos=Text.to_pos_on_line(State, line, x, y),
pos=Text.to_pos_on_line(State, line_index, x, y),
}
--? print('selection', State.selection1.line, State.selection1.pos)
break
@ -249,7 +249,7 @@ function edit.mouse_released(State, x,y, mouse_button)
--? print('reset selection')
State.cursor1 = {
line=line_index,
pos=Text.to_pos_on_line(State, line, x, y),
pos=Text.to_pos_on_line(State, line_index, x, y),
}
--? print('cursor', State.cursor1.line, State.cursor1.pos)
if State.mousepress_shift then

View File

@ -94,7 +94,7 @@ function Text.to_pos(State, x,y)
for line_index,line in ipairs(State.lines) do
if line.mode == 'text' then
if Text.in_line(State, line_index, x,y) then
return line_index, Text.to_pos_on_line(State, line, x,y)
return line_index, Text.to_pos_on_line(State, line_index, x,y)
end
end
end

View File

@ -703,7 +703,8 @@ function Text.in_line(State, line_index, x,y)
end
-- convert mx,my in pixels to schema-1 coordinates
function Text.to_pos_on_line(State, line, mx, my)
function Text.to_pos_on_line(State, line_index, mx, my)
local line = State.lines[line_index]
if line.fragments == nil then
Text.compute_fragments(line, State.left, State.right)
end
@ -964,10 +965,9 @@ function Text.tweak_screen_top_and_cursor(State)
--? print('too low')
if Text.cursor_past_screen_bottom(State) then
--? print('tweak')
local line = State.lines[State.screen_bottom1.line]
State.cursor1 = {
line=State.screen_bottom1.line,
pos=Text.to_pos_on_line(State, line, App.screen.width-5, App.screen.height-5),
pos=Text.to_pos_on_line(State, State.screen_bottom1.line, App.screen.width-5, App.screen.height-5),
}
end
end