ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

editor: Right align left editor using scroll limited portal

Browse source
This commit is contained in:
Andrew Hamilton 2022-01-24 23:10:44 +10:00
parent 972e6144fc
commit c419f69d81
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
diff_edit/__init__.py
View file

@ -128,7 +128,7 @@ def draw_connector(columns, color, left_y, right_y):
class DiffEditor: class DiffEditor:
def __init__(self, left_path, right_path): def __init__(self, left_path, right_path):
self.left_editor = editor.Editor(is_right_aligned=True) self.left_editor = editor.Editor(is_left_aligned=False)
self.left_editor.load(left_path) self.left_editor.load(left_path)
self.left_editor.view_widget.is_left_scrollbar = True self.left_editor.view_widget.is_left_scrollbar = True
self.right_editor = editor.Editor() self.right_editor = editor.Editor()

13
diff_edit/editor.py
View file

@ -184,8 +184,9 @@ class Editor:
THEMES = [pygments.styles.get_style_by_name(style) THEMES = [pygments.styles.get_style_by_name(style)
for style in ["monokai", "fruity", "native"]] + [None] for style in ["monokai", "fruity", "native"]] + [None]
def __init__(self, text="", path="Untitled", is_right_aligned=False): def __init__(self, text="", path="Untitled", is_left_aligned=True):
self.path = os.path.normpath(path) self.path = os.path.normpath(path)
self.is_left_aligned = is_left_aligned
self.set_text(text) self.set_text(text)
self.mark = None self.mark = None
self.clipboard = None self.clipboard = None
@ -195,7 +196,6 @@ class Editor:
self.theme_index = 0 self.theme_index = 0
self.previous_term_code = None self.previous_term_code = None
self.history = [] self.history = []
self.is_right_aligned = is_right_aligned
@property @property
def cursor_x(self): def cursor_x(self):
@ -252,6 +252,9 @@ class Editor:
self.decor_widget = Decor(self.text_widget, self.decor_widget = Decor(self.text_widget,
lambda appearance: add_highlights(self, appearance)) lambda appearance: add_highlights(self, appearance))
self.view_widget = fill3.View.from_widget(self.decor_widget) self.view_widget = fill3.View.from_widget(self.decor_widget)
if not self.is_left_aligned:
self.view_widget.portal.is_scroll_limited = True
self.view_widget.portal.is_left_aligned = False
self.cursor_x, self.cursor_y = 0, 0 self.cursor_x, self.cursor_y = 0, 0
self.original_text = self.text_widget.actual_text.copy() self.original_text = self.text_widget.actual_text.copy()
@ -628,12 +631,6 @@ class Editor:
def appearance_for(self, dimensions): def appearance_for(self, dimensions):
width, height = dimensions width, height = dimensions
text_width = self.text_widget.max_line_length text_width = self.text_widget.max_line_length
if self.is_right_aligned and text_width < width:
x, y = self.view_widget.position
new_x = text_width - width
if self.cursor_x == text_width:
new_x += 1
self.view_widget.position = new_x, y
is_changed = self.text_widget.actual_text != self.original_text is_changed = self.text_widget.actual_text != self.original_text
header = self.get_header(self.path, width, self.cursor_x, self.cursor_y, is_changed) header = self.get_header(self.path, width, self.cursor_x, self.cursor_y, is_changed)
self.last_width = width self.last_width = width

2
setup.py
View file

@ -18,4 +18,4 @@ setup(name="diff-edit",
entry_points={"console_scripts": ["diff-edit=diff_edit:main"]}, entry_points={"console_scripts": ["diff-edit=diff_edit:main"]},
install_requires=[ install_requires=[
"pygments==2.10.0", "docopt==0.6.2", "pygments==2.10.0", "docopt==0.6.2",
"fill3 @ git+https://github.com/ahamilton/eris@v2022.01.21#subdirectory=fill3"]) "fill3 @ git+https://github.com/ahamilton/eris@v2022.01.24#subdirectory=fill3"])