idea: set recent_mouse on mouse events
This helps, but doesn't address the C-a case. As it stands, literally my first click of the mouse might need access to recent_mouse.line/pos
This commit is contained in:
parent
3e848efb08
commit
9b3fa33f5b
3
edit.lua
3
edit.lua
|
@ -249,7 +249,7 @@ function edit.mouse_press(State, x,y, mouse_button)
|
||||||
line=line_index,
|
line=line_index,
|
||||||
pos=Text.to_pos_on_line(State, line_index, x, y),
|
pos=Text.to_pos_on_line(State, line_index, x, y),
|
||||||
}
|
}
|
||||||
print_and_log(('edit.mouse_press: selection now %d,%d'):format(State.selection1.line, State.selection1.pos))
|
State.recent_mouse = {time=Current_time, line=State.selection1.line, pos=State.selection1.pos}
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
elseif line.mode == 'drawing' then
|
elseif line.mode == 'drawing' then
|
||||||
|
@ -286,6 +286,7 @@ function edit.mouse_release(State, x,y, mouse_button)
|
||||||
pos=Text.to_pos_on_line(State, line_index, x, y),
|
pos=Text.to_pos_on_line(State, line_index, x, y),
|
||||||
}
|
}
|
||||||
print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))
|
print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))
|
||||||
|
State.recent_mouse = {time=Current_time, line=State.cursor1.line, pos=State.cursor1.pos}
|
||||||
if State.mousepress_shift then
|
if State.mousepress_shift then
|
||||||
if State.old_selection1.line == nil then
|
if State.old_selection1.line == nil then
|
||||||
State.selection1 = State.old_cursor1
|
State.selection1 = State.old_cursor1
|
||||||
|
|
|
@ -69,12 +69,11 @@ end
|
||||||
|
|
||||||
-- inefficient for some reason, so don't do it on every frame
|
-- inefficient for some reason, so don't do it on every frame
|
||||||
function Text.mouse_pos(State)
|
function Text.mouse_pos(State)
|
||||||
local time = love.timer.getTime()
|
if State.recent_mouse.time and State.recent_mouse.time > Current_time-0.1 then
|
||||||
if State.recent_mouse.time and State.recent_mouse.time > time-0.1 then
|
|
||||||
print_and_log(('text.mouse_pos: returning recent value %d,%d'):format(State.recent_mouse.line, State.recent_mouse.pos))
|
print_and_log(('text.mouse_pos: returning recent value %d,%d'):format(State.recent_mouse.line, State.recent_mouse.pos))
|
||||||
return State.recent_mouse.line, State.recent_mouse.pos
|
return State.recent_mouse.line, State.recent_mouse.pos
|
||||||
end
|
end
|
||||||
State.recent_mouse.time = time
|
State.recent_mouse.time = Current_time
|
||||||
local line,pos = Text.to_pos(State, App.mouse_x(), App.mouse_y())
|
local line,pos = Text.to_pos(State, App.mouse_x(), App.mouse_y())
|
||||||
if line then
|
if line then
|
||||||
State.recent_mouse.line = line
|
State.recent_mouse.line = line
|
||||||
|
|
Loading…
Reference in New Issue