From 944834b7c881983b31cdfecfc8fd262443e623fd Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 6 Oct 2016 11:59:25 +0100 Subject: [PATCH] (Popup) Ensure popup gets key input focus when it is displayed Change-Id: Iae70d7e1fe640186dc0faa127d5683b9b7c655d4 --- dali-toolkit/internal/controls/popup/popup-impl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 08fbe4e..8274628 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -703,6 +703,9 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) // Update the state to indicate the current intent. mDisplayState = Toolkit::Popup::SHOWING; + // We want the popup to have key input focus when it is displayed + SetKeyInputFocus(); + // We are displaying so bring the popup layer to the front, and set it visible so it is rendered. mLayer.RaiseToTop(); mLayer.SetVisible( true ); @@ -744,7 +747,6 @@ void Popup::SetDisplayState( Toolkit::Popup::DisplayState displayState ) if( focusActor ) { - SetKeyInputFocus(); keyboardFocusManager.SetCurrentFocusActor( focusActor ); } } -- 2.7.4