merge trunk

(bzr r4016.2.32)

3 files changed, 8 insertions, 6 deletions

diff --git a/lockscreen/KylinUserPromptView.cpp b/lockscreen/KylinUserPromptView.cpp
index 8369e802d..a5a63d0a5 100644
--- a/lockscreen/KylinUserPromptView.cpp
+++ b/lockscreen/KylinUserPromptView.cpp
@@ -296,7 +296,7 @@ void KylinUserPromptView::AddPrompt(std::string const& message, bool visible, Pr
 text_input->hint_color = nux::Color(0.0f, 0.0f, 0.0f, 0.5f);
 text_input->input_hint = SanitizeMessage(message);
 text_input->hint_font_size = PROMPT_FONT_SIZE;
- text_input->show_caps_lock = true;
+ text_input->show_lock_warnings = true;
 text_input->show_activator = true;
 text_entry->SetPasswordMode(!visible);
 text_entry->SetPasswordChar("•");
diff --git a/lockscreen/LockScreenPanel.cpp b/lockscreen/LockScreenPanel.cpp
index 1a2b26351..d2fbc8d39 100644
--- a/lockscreen/LockScreenPanel.cpp
+++ b/lockscreen/LockScreenPanel.cpp
@@ -165,10 +165,12 @@ void Panel::OnEntryShowMenu(std::string const& entry_id, unsigned xid, int x, in
 if (!GetInputEventSensitivity())
 return;
 
- // This is ugly... But Nux fault!
- WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
-
- active = true;
+ if (!active)
+ {
+ // This is ugly... But Nux fault!
+ WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
+ active = true;
+ }
 }
 
 void Panel::OnEntryActivateRequest(std::string const& entry_id)
diff --git a/lockscreen/UserPromptView.cpp b/lockscreen/UserPromptView.cpp
index 32794dfb8..efc6277f1 100644
--- a/lockscreen/UserPromptView.cpp
+++ b/lockscreen/UserPromptView.cpp
@@ -317,7 +317,7 @@ void UserPromptView::AddPrompt(std::string const& message, bool visible, Promise
 text_input->scale = scale();
 text_input->input_hint = SanitizeMessage(message);
 text_input->hint_font_size = PROMPT_FONT_SIZE;
- text_input->show_caps_lock = true;
+ text_input->show_lock_warnings = true;
 text_input->show_activator = true;
 text_entry->SetPasswordMode(!visible);
 text_entry->SetPasswordChar("•");