xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow scrolling while dragging mouse

Browse Source 
Closes #2052
This commit is contained in:
Maxime Coste 2019-09-15 10:05:44 +10:00
parent 6ee71191af
commit 858ae14f76
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input_handler.cc
View File

@ -138,8 +138,7 @@ struct MouseHandler
return true; return true;
case Key::Modifiers::Scroll: case Key::Modifiers::Scroll:
m_dragging = false; scroll_window(context, static_cast<int32_t>(key.key), not m_dragging);
scroll_window(context, static_cast<int32_t>(key.key));
return true; return true;
default: return false; default: return false;
@ -1737,7 +1736,7 @@ void hide_auto_info_ifn(const Context& context, bool hide)
context.client().info_hide(); context.client().info_hide();
} }
void scroll_window(Context& context, LineCount offset) void scroll_window(Context& context, LineCount offset, bool adapt_cursor)
{ {
Window& window = context.window(); Window& window = context.window();
Buffer& buffer = context.buffer(); Buffer& buffer = context.buffer();
@ -1751,6 +1750,10 @@ void scroll_window(Context& context, LineCount offset)
const LineCount line_count = buffer.line_count(); const LineCount line_count = buffer.line_count();
win_pos.line = clamp(win_pos.line + offset, 0_line, line_count-1); win_pos.line = clamp(win_pos.line + offset, 0_line, line_count-1);
window.set_position(win_pos);
if (not adapt_cursor)
return;
SelectionList& selections = context.selections(); SelectionList& selections = context.selections();
const BufferCoord cursor = selections.main().cursor(); const BufferCoord cursor = selections.main().cursor();
@ -1766,7 +1769,6 @@ void scroll_window(Context& context, LineCount offset)
buffer[line].length()-1); buffer[line].length()-1);
selections = SelectionList{buffer, BufferCoord{line, col}}; selections = SelectionList{buffer, BufferCoord{line, col}};
window.set_position(win_pos);
} }
} }

2
src/input_handler.hh
View File

@ -186,7 +186,7 @@ void on_next_key_with_autoinfo(const Context& context, KeymapMode keymap_mode, C
}); });
} }
void scroll_window(Context& context, LineCount offset); void scroll_window(Context& context, LineCount offset, bool adapt_cursor = true);
} }