aniani/toot
1
0
Fork 0
mirror of https://github.com/ihabunek/toot.git synced 2024-11-03 04:17:21 -05:00
Code

Minor compose window cleanup / misc fixes

Browse Source 
+ Remove excess padding on width
+ Rename TextModal to EntryModal
+ Remove duplicate delete key handler
+ Redraw when CW modal closes
+ Return empty string rather than None
This commit is contained in:
Derek Schmidt 2019-03-01 14:17:58 -07:00 committed by Ivan Habunek
parent a367f78cbb
commit 7f5c201925
No known key found for this signature in database
GPG Key ID: CDBD63C43A30BB95
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
toot/ui/app.py
View File

@ -318,7 +318,7 @@ class HelpModal(Modal):
] ]
class TextModal(Modal): class EntryModal(Modal):
def __init__(self, stdscr, title, footer=None, size=(None, None)): def __init__(self, stdscr, title, footer=None, size=(None, None)):
self.content = [] self.content = []
self.cursor_pos = 0 self.cursor_pos = 0
@ -333,8 +333,8 @@ class TextModal(Modal):
height, width, y, x = self.get_size_pos(stdscr) height, width, y, x = self.get_size_pos(stdscr)
self.window = curses.newwin(height, width, y, x) self.window = curses.newwin(height, width, y, x)
self.text_window = self.window.derwin(height - (self.pad_y * 2), width - (self.pad_x * 2 + 1), self.pad_y, self.pad_x) self.text_window = self.window.derwin(height - (self.pad_y * 2), width - (self.pad_x * 2), self.pad_y, self.pad_x)
self.text_window.keypad(1) self.text_window.keypad(True)
self.draw() self.draw()
self.panel = curses.panel.new_panel(self.window) self.panel = curses.panel.new_panel(self.window)
@ -347,7 +347,7 @@ class TextModal(Modal):
else: else:
height = int(screen_height / 1.33) height = int(screen_height / 1.33)
if self.size[1]: if self.size[1]:
width = self.size[1] + (self.pad_x * 2 + 1) + 1 width = self.size[1] + (self.pad_x * 2) + 1
else: else:
width = int(screen_width / 1.25) width = int(screen_width / 1.25)
@ -391,11 +391,6 @@ class TextModal(Modal):
if self.cursor_pos >= 0 and self.cursor_pos < len(self.content): if self.cursor_pos >= 0 and self.cursor_pos < len(self.content):
del self.content[self.cursor_pos] del self.content[self.cursor_pos]
elif ch == curses.KEY_DC:
if self.cursor_pos > 0 and self.cursor_pos <= len(self.content):
del self.content[self.cursor_pos - 1]
self.cursor_pos -= 1
elif ch == curses.KEY_LEFT: elif ch == curses.KEY_LEFT:
if self.cursor_pos > 0: if self.cursor_pos > 0:
self.cursor_pos -= 1 self.cursor_pos -= 1
@ -423,18 +418,19 @@ class TextModal(Modal):
if not self.do_command(ch): if not self.do_command(ch):
break break
self.hide() self.hide()
return ''.join(self.content) if len(self.content) > 0 else None return ''.join(self.content)
class ComposeModal(TextModal): class ComposeModal(EntryModal):
def __init__(self, stdscr): def __init__(self, stdscr):
super().__init__(stdscr, title="Compose a toot", footer="^G to submit, ^Q to quit, ^S to mark sensitive (cw)") super().__init__(stdscr, title="Compose a toot", footer="^G to submit, ^Q to quit, ^S to mark sensitive (cw)")
self.cw = None self.cw = None
self.cwmodal = TextModal(stdscr, title="Content warning", size=(1, 60)) self.cwmodal = EntryModal(stdscr, title="Content warning", size=(1, 60))
def do_command(self, ch): def do_command(self, ch):
if ch == curses.ascii.ctrl(ord('s')): if ch == curses.ascii.ctrl(ord('s')):
self.cw = self.cwmodal.loop() self.cw = self.cwmodal.loop() or None
self.draw()
return True return True
else: else:
return super().do_command(ch) return super().do_command(ch)