Merge remote-tracking branch 'origin/pr/4361'

This commit is contained in:
Florian Bruhin 2018-10-26 09:40:20 +02:00
commit c0dac51459

View File

@ -101,7 +101,7 @@ class HintLabel(QLabel):
matched: The part of the text which was typed. matched: The part of the text which was typed.
unmatched: The part of the text which was not typed yet. unmatched: The part of the text which was not typed yet.
""" """
if (config.val.hints.uppercase and if (config.cache['hints.uppercase'] and
self._context.hint_mode in ['letter', 'word']): self._context.hint_mode in ['letter', 'word']):
matched = html.escape(matched.upper()) matched = html.escape(matched.upper())
unmatched = html.escape(unmatched.upper()) unmatched = html.escape(unmatched.upper())
@ -109,7 +109,7 @@ class HintLabel(QLabel):
matched = html.escape(matched) matched = html.escape(matched)
unmatched = html.escape(unmatched) unmatched = html.escape(unmatched)
match_color = html.escape(config.val.colors.hints.match.fg) match_color = html.escape(config.cache['colors.hints.match.fg'])
if matched: if matched:
self.setText('<font color="{}">{}</font>{}'.format( self.setText('<font color="{}">{}</font>{}'.format(
match_color, matched, unmatched)) match_color, matched, unmatched))
@ -125,7 +125,7 @@ class HintLabel(QLabel):
log.hints.debug("Frame for {!r} vanished!".format(self)) log.hints.debug("Frame for {!r} vanished!".format(self))
self.hide() self.hide()
return return
no_js = config.val.hints.find_implementation != 'javascript' no_js = config.cache['hints.find_implementation'] != 'javascript'
rect = self.elem.rect_on_view(no_js=no_js) rect = self.elem.rect_on_view(no_js=no_js)
self.move(rect.x(), rect.y()) self.move(rect.x(), rect.y())