Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reset logic #341

Merged
merged 3 commits into from
Sep 7, 2021
Merged

Fix reset logic #341

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d89c23e
Remove garbage left behind when rerendering the right side of the dialog
aycabta Sep 7, 2021
3b7a190
Remove variables that have no meaning in calculations
aycabta Sep 7, 2021
5cea268
Render scrollbar when the column of the dialog is moved
aycabta Sep 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lib/reline/line_editor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,9 +706,10 @@ def add_dialog_proc(name, p, context = nil)
bg_color = '46'
end
end
str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, dialog.width - @block_elem_width), dialog.width - @block_elem_width)
str_width = dialog.width - (dialog.scrollbar_pos.nil? ? 0 : @block_elem_width)
str = padding_space_with_escape_sequences(Reline::Unicode.take_range(item, 0, str_width), str_width)
@output.write "\e[#{bg_color}m#{str}"
if dialog.scrollbar_pos and dialog.scrollbar_pos != old_dialog.scrollbar_pos
if dialog.scrollbar_pos and (dialog.scrollbar_pos != old_dialog.scrollbar_pos or dialog.column != old_dialog.column)
@output.write "\e[37m"
if dialog.scrollbar_pos <= (i * 2) and (i * 2 + @block_elem_width) < (dialog.scrollbar_pos + bar_height)
@output.write '█'
Expand Down Expand Up @@ -810,9 +811,7 @@ def add_dialog_proc(name, p, context = nil)
end
move_cursor_up(old_dialog.vertical_offset + line_num - 1 - y_diff)
end
old_dialog_scrollbar = old_dialog.scrollbar_pos.nil? ? 0 : @block_elem_width
dialog_scrollbar = dialog.scrollbar_pos.nil? ? 0 : @block_elem_width
if (old_dialog.column + old_dialog.width - old_dialog_scrollbar) > (dialog.column + dialog.width - dialog_scrollbar)
if (old_dialog.column + old_dialog.width) > (dialog.column + dialog.width)
# rerender right
move_cursor_down(old_dialog.vertical_offset + y_diff)
width = (old_dialog.column + old_dialog.width) - (dialog.column + dialog.width)
Expand Down