projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename OnStage signals and related internal changes
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
focus-manager
/
keyinput-focus-manager-impl.cpp
diff --git
a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index
71bc352
..
2549e52
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-21,14
+21,10
@@
// EXTERNAL INCLUDES
#include <cstring> // for strcmp
#include <dali/public-api/actors/layer.h>
// EXTERNAL INCLUDES
#include <cstring> // for strcmp
#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/devel-api/common/stage-devel.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
-#include <dali/integration-api/adaptors/adaptor.h>
-
-// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali/integration-api/debug.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali/integration-api/debug.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
namespace Dali
{
namespace Dali
{
@@
-53,23
+49,23
@@
KeyInputFocusManager::KeyInputFocusManager()
mCurrentFocusControl()
{
// Retrieve all the existing widnows
mCurrentFocusControl()
{
// Retrieve all the existing widnows
- Dali::
WindowContainer windows = Adaptor::Get().GetWindow
s();
- for
( auto iter = windows.begin(); iter != window
s.end(); ++iter )
+ Dali::
SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolder
s();
+ for
( auto iter = sceneHolders.begin(); iter != sceneHolder
s.end(); ++iter )
{
{
-
DevelWindow::KeyEventGeneratedSignal( *iter ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
+
( *iter ).KeyEventGeneratedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
}
}
- // Get notified when any new
window
is created afterwards
- Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::On
WindowCreated
);
+ // Get notified when any new
scene holder
is created afterwards
+ Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::On
SceneHolderCreated
);
}
KeyInputFocusManager::~KeyInputFocusManager()
{
}
}
KeyInputFocusManager::~KeyInputFocusManager()
{
}
-void KeyInputFocusManager::On
WindowCreated( Dali::Window& window
)
+void KeyInputFocusManager::On
SceneHolderCreated( Dali::Integration::SceneHolder& sceneHolder
)
{
{
-
DevelWindow::KeyEventGeneratedSignal( window ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
+
sceneHolder.KeyEventGeneratedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
}
void KeyInputFocusManager::SetFocus( Toolkit::Control control )
}
void KeyInputFocusManager::SetFocus( Toolkit::Control control )
@@
-86,7
+82,7
@@
void KeyInputFocusManager::SetFocus( Toolkit::Control control )
return;
}
return;
}
- control.OffS
tageSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlStag
eDisconnection );
+ control.OffS
ceneSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlScen
eDisconnection );
Dali::Toolkit::Control previousFocusControl = GetCurrentFocusControl();
if( previousFocusControl )
Dali::Toolkit::Control previousFocusControl = GetCurrentFocusControl();
if( previousFocusControl )
@@
-112,7
+108,7
@@
void KeyInputFocusManager::RemoveFocus( Toolkit::Control control )
{
if( control == mCurrentFocusControl )
{
{
if( control == mCurrentFocusControl )
{
- control.OffS
tageSignal().Disconnect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlStag
eDisconnection );
+ control.OffS
ceneSignal().Disconnect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlScen
eDisconnection );
// Notify the control that it has lost key input focus
GetImplementation( control ).OnKeyInputFocusLost();
// Notify the control that it has lost key input focus
GetImplementation( control ).OnKeyInputFocusLost();
@@
-168,7
+164,7
@@
bool KeyInputFocusManager::EmitKeyEventSignal( Toolkit::Control control, const K
return consumed;
}
return consumed;
}
-void KeyInputFocusManager::OnFocusControlS
tag
eDisconnection( Dali::Actor actor )
+void KeyInputFocusManager::OnFocusControlS
cen
eDisconnection( Dali::Actor actor )
{
RemoveFocus( Dali::Toolkit::Control::DownCast( actor ) );
}
{
RemoveFocus( Dali::Toolkit::Control::DownCast( actor ) );
}