Mercurial > libervia-backend
changeset 1975:da6d1988dfcb
merged main branch
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Mon, 27 Jun 2016 22:49:36 +0200 |
| parents | a9908e751c42 (current diff) b34fdb44b7d4 (diff) |
| children | bdc6a5b07922 |
| files | frontends/src/primitivus/primitivus |
| diffstat | 1 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/frontends/src/primitivus/primitivus Mon Jun 27 22:37:51 2016 +0200 +++ b/frontends/src/primitivus/primitivus Mon Jun 27 22:49:36 2016 +0200 @@ -403,12 +403,19 @@ 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