aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2015-07-19 08:58:14 +0200
committerMartijn Kaijser <martijn@xbmc.org>2015-07-19 08:58:14 +0200
commitde73966842adb87da481ae1110a0d94a6f34fdbd (patch)
tree7b309548aec9a76f20b683f52ddfa29773bc6db0
parenta2523a66b074447a053f2b73b1479019a1e4411e (diff)
parent7681d31e0fe45d8c7f462b258aded3855d550331 (diff)
Merge pull request #7541 from xhaggi/fix-first-letter-remains-visible-in-keyboard-dialog
[guilib] fix first letter remains visible in keyboard dialog
-rw-r--r--xbmc/guilib/GUIEditControl.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/xbmc/guilib/GUIEditControl.cpp b/xbmc/guilib/GUIEditControl.cpp
index 7cfda87d8f..d86a1cbec1 100644
--- a/xbmc/guilib/GUIEditControl.cpp
+++ b/xbmc/guilib/GUIEditControl.cpp
@@ -487,14 +487,16 @@ void CGUIEditControl::ProcessText(unsigned int currentTime)
std::wstring text = GetDisplayedText();
- if (!HasFocus() && text.empty())
+ if ((HasFocus() || GetParentID() == WINDOW_DIALOG_KEYBOARD) && m_inputType != INPUT_TYPE_READONLY)
+ {
+ changed |= SetStyledText(text);
+ }
+ else if (!HasFocus() && text.empty())
{
std::string hint = m_hintInfo.GetLabel(GetParentID());
if (!hint.empty())
changed |= m_label2.SetText(hint);
}
- else if ((HasFocus() || GetParentID() == WINDOW_DIALOG_KEYBOARD) && m_inputType != INPUT_TYPE_READONLY)
- changed |= SetStyledText(text);
else
changed |= m_label2.SetTextW(text);