merged main branch
This commit is contained in:
commit
4afff0d837
1 changed files with 13 additions and 6 deletions
|
|
@ -403,12 +403,19 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
except AttributeError:
|
||||
log.warning(u"Paste discarded: there is no edit bar yet")
|
||||
else:
|
||||
# XXX: if a paste is detected, we append it directly to the edit bar text
|
||||
# so the use can check it and press [enter] if it's OK
|
||||
buf_paste = u''.join(self.keysToText(input_))
|
||||
pos = edit_bar.edit_pos
|
||||
edit_bar.set_edit_text(u'{}{}{}'.format(edit_bar.edit_text[:pos], buf_paste, edit_bar.edit_text[pos:]))
|
||||
edit_bar.edit_pos+=len(buf_paste)
|
||||
if self.main_widget.focus == edit_bar:
|
||||
# XXX: if a paste is detected, we append it directly to the edit bar text
|
||||
# so the user can check it and press [enter] if it's OK
|
||||
buf_paste = u''.join(self.keysToText(input_))
|
||||
pos = edit_bar.edit_pos
|
||||
edit_bar.set_edit_text(u'{}{}{}'.format(edit_bar.edit_text[:pos], buf_paste, edit_bar.edit_text[pos:]))
|
||||
edit_bar.edit_pos+=len(buf_paste)
|
||||
else:
|
||||
# we are not on the edit_bar,
|
||||
# so we treat pasted text as normal text
|
||||
if extra is None:
|
||||
extra = []
|
||||
extra.extend(input_)
|
||||
if not extra:
|
||||
return
|
||||
input_ = extra
|
||||
|
|
|
|||
Loading…
Reference in a new issue