summaryrefslogtreecommitdiff
path: root/shutdown
diff options
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2013-03-11 07:17:56 +0000
committerTarmac <>2013-03-11 07:17:56 +0000
commit4cf99854aad6effadc8f8dcf50102bf2b834be42 (patch)
tree2e458ec0905368dc45f67461686d15760d101ba6 /shutdown
parentabdde7a4b9fe80933dfd6280093cf6a55ba721b4 (diff)
parentf17bf7487424172e6da24618f04bbccb227b6c60 (diff)
UnityWindowView: Close a window also on escape key. Fixes: https://bugs.launchpad.net/bugs/1152712.
Approved by PS Jenkins bot, Andrea Azzarone. (bzr r3203)
Diffstat (limited to 'shutdown')
-rw-r--r--shutdown/SessionView.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/shutdown/SessionView.cpp b/shutdown/SessionView.cpp
index d8a7f6f79..93e77c996 100644
--- a/shutdown/SessionView.cpp
+++ b/shutdown/SessionView.cpp
@@ -296,7 +296,8 @@ nux::Area* View::FindKeyFocusArea(unsigned etype, unsigned long key_code, unsign
{
nux::InputArea* focused = nux::GetWindowCompositor().GetKeyFocusArea();
- if (!focused || !focused->IsMouseInside())
+ // Let's reset the focused area if we're in keyboard-navigation mode.
+ if (focused && focused->IsChildOf(buttons_layout_) && !focused->IsMouseInside())
return this;
}