KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

diff kitten: Misc fixes to msg display in the status line

Browse Source
This commit is contained in:
Kovid Goyal 2018-06-16 08:57:02 +05:30
parent e8f7a2b345
commit ad97315925
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kittens/diff/main.py
View File

@ -223,7 +223,7 @@ class DiffHandler(Handler):
self.create_collection() self.create_collection()
def enforce_cursor_state(self): def enforce_cursor_state(self):
self.cmd.set_cursor_visible(self.state > DIFFED) self.cmd.set_cursor_visible(self.state == COMMAND)
def draw_lines(self, num, offset=0): def draw_lines(self, num, offset=0):
offset += self.scroll_pos offset += self.scroll_pos
@ -301,7 +301,7 @@ class DiffHandler(Handler):
if self.state is COMMAND: if self.state is COMMAND:
self.line_edit.write(self.write) self.line_edit.write(self.write)
elif self.state is MESSAGE: elif self.state is MESSAGE:
self.write(self.message) self.cmd.styled(self.message, reverse=True)
else: else:
sp = '{:.0%}'.format(self.scroll_pos/self.max_scroll_pos) if self.scroll_pos and self.max_scroll_pos else '0%' sp = '{:.0%}'.format(self.scroll_pos/self.max_scroll_pos) if self.scroll_pos and self.max_scroll_pos else '0%'
scroll_frac = styled(sp, fg=self.opts.margin_fg) scroll_frac = styled(sp, fg=self.opts.margin_fg)
@ -347,7 +347,7 @@ class DiffHandler(Handler):
self.current_search = Search(self.opts, query[1:], self.current_search_is_regex, query[0] == '?') self.current_search = Search(self.opts, query[1:], self.current_search_is_regex, query[0] == '?')
except BadRegex: except BadRegex:
self.state = MESSAGE self.state = MESSAGE
self.message = sanitize(_('Bad regex: {}').format(query)) self.message = sanitize(_('Bad regex: {}').format(query[1:]))
self.cmd.bell() self.cmd.bell()
else: else:
if not self.current_search(self.diff_lines, self.margin_size, self.screen_size.cols): if not self.current_search(self.diff_lines, self.margin_size, self.screen_size.cols):
@ -362,6 +362,7 @@ class DiffHandler(Handler):
return return
if self.state is MESSAGE: if self.state is MESSAGE:
self.state = DIFFED self.state = DIFFED
self.draw_status_line()
return return
action = self.shortcut_action(text) action = self.shortcut_action(text)
if action is not None: if action is not None:
@ -371,6 +372,7 @@ class DiffHandler(Handler):
if self.state is MESSAGE: if self.state is MESSAGE:
if key_event.type is not RELEASE: if key_event.type is not RELEASE:
self.state = DIFFED self.state = DIFFED
self.draw_status_line()
return return
if self.state is COMMAND: if self.state is COMMAND:
if self.line_edit.on_key(key_event): if self.line_edit.on_key(key_event):