Commit 76e1a81ad9b5d97aa111c5d62033ac0723ce2579
[dali_1.2.35] Merge branch 'devel/master'
Change-Id: I884ba8d0ca9f9d530ee66f778b4519838d652fde
Showing
3 changed files
with
3 additions
and
12 deletions
examples/popup/popup-example.cpp
| @@ -20,7 +20,6 @@ | @@ -20,7 +20,6 @@ | ||
| 20 | #include <dali-toolkit/dali-toolkit.h> | 20 | #include <dali-toolkit/dali-toolkit.h> |
| 21 | #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> | 21 | #include <dali-toolkit/devel-api/controls/buttons/button-devel.h> |
| 22 | #include <dali-toolkit/devel-api/controls/popup/popup.h> | 22 | #include <dali-toolkit/devel-api/controls/popup/popup.h> |
| 23 | -#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h> | ||
| 24 | 23 | ||
| 25 | using namespace Dali; | 24 | using namespace Dali; |
| 26 | 25 | ||
| @@ -117,11 +116,7 @@ public: | @@ -117,11 +116,7 @@ public: | ||
| 117 | Stage stage = Stage::GetCurrent(); | 116 | Stage stage = Stage::GetCurrent(); |
| 118 | 117 | ||
| 119 | // Respond to key events if not handled | 118 | // Respond to key events if not handled |
| 120 | - Toolkit::KeyInputFocusManager keyInputFocusManager = Toolkit::KeyInputFocusManager::Get(); | ||
| 121 | - if( keyInputFocusManager ) | ||
| 122 | - { | ||
| 123 | - keyInputFocusManager.UnhandledKeyEventSignal().Connect( this, &PopupExample::OnKeyEvent ); | ||
| 124 | - } | 119 | + stage.KeyEventSignal().Connect( this, &PopupExample::OnKeyEvent ); |
| 125 | 120 | ||
| 126 | // Creates a default view with a default tool bar. | 121 | // Creates a default view with a default tool bar. |
| 127 | // The view is added to the stage. | 122 | // The view is added to the stage. |
examples/size-negotiation/size-negotiation-example.cpp
| @@ -114,11 +114,7 @@ public: | @@ -114,11 +114,7 @@ public: | ||
| 114 | Stage stage = Stage::GetCurrent(); | 114 | Stage stage = Stage::GetCurrent(); |
| 115 | 115 | ||
| 116 | // Respond to key events if not handled | 116 | // Respond to key events if not handled |
| 117 | - Toolkit::KeyInputFocusManager keyInputFocusManager = Toolkit::KeyInputFocusManager::Get(); | ||
| 118 | - if( keyInputFocusManager ) | ||
| 119 | - { | ||
| 120 | - keyInputFocusManager.UnhandledKeyEventSignal().Connect(this, &SizeNegotiationController::OnKeyEvent); | ||
| 121 | - } | 117 | + stage.KeyEventSignal().Connect(this, &SizeNegotiationController::OnKeyEvent); |
| 122 | 118 | ||
| 123 | // Creates a default view with a default tool bar. | 119 | // Creates a default view with a default tool bar. |
| 124 | // The view is added to the stage. | 120 | // The view is added to the stage. |
packaging/com.samsung.dali-demo.spec
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | Name: com.samsung.dali-demo | 3 | Name: com.samsung.dali-demo |
| 4 | Summary: The OpenGLES Canvas Core Demo | 4 | Summary: The OpenGLES Canvas Core Demo |
| 5 | -Version: 1.2.34 | 5 | +Version: 1.2.35 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |