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
Merge "Change BuildRequires of dali2-toolkit to Requires" into devel/master
[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
cb62a91
..
ad87ac3
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) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
@@
-19,99
+19,95
@@
#include "keyinput-focus-manager-impl.h"
// EXTERNAL INCLUDES
#include "keyinput-focus-manager-impl.h"
// EXTERNAL INCLUDES
-#include <cstring> // for strcmp
-#include <dali/public-api/actors/layer.h>
#include <dali-toolkit/public-api/controls/control-impl.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>
#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/integration-api/adaptor-framework/scene-holder.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/actors/layer.h>
+#include <cstring> // for strcmp
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
namespace
{
namespace
{
-
// Signals
const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED = "keyInputFocusChanged";
// Signals
const char* const SIGNAL_KEY_INPUT_FOCUS_CHANGED = "keyInputFocusChanged";
-}
+}
// namespace
KeyInputFocusManager::KeyInputFocusManager()
KeyInputFocusManager::KeyInputFocusManager()
-: mSlotDelegate(
this
),
+: mSlotDelegate(
this
),
mCurrentFocusControl()
{
// Retrieve all the existing widnows
Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders();
mCurrentFocusControl()
{
// Retrieve all the existing widnows
Dali::SceneHolderList sceneHolders = Adaptor::Get().GetSceneHolders();
- for(
auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter
)
+ for(
auto iter = sceneHolders.begin(); iter != sceneHolders.end(); ++iter
)
{
{
- (
*iter ).KeyEventGeneratedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
+ (
*iter).KeyEventGeneratedSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
}
// Get notified when any new scene holder is created afterwards
}
// Get notified when any new scene holder is created afterwards
- Adaptor::Get().WindowCreatedSignal().Connect(
mSlotDelegate, &KeyInputFocusManager::OnSceneHolderCreated
);
+ Adaptor::Get().WindowCreatedSignal().Connect(
mSlotDelegate, &KeyInputFocusManager::OnSceneHolderCreated
);
}
KeyInputFocusManager::~KeyInputFocusManager()
{
}
}
KeyInputFocusManager::~KeyInputFocusManager()
{
}
-void KeyInputFocusManager::OnSceneHolderCreated(
Dali::Integration::SceneHolder& sceneHolder
)
+void KeyInputFocusManager::OnSceneHolderCreated(
Dali::Integration::SceneHolder& sceneHolder
)
{
{
- sceneHolder.KeyEventGeneratedSignal().Connect(
mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
+ sceneHolder.KeyEventGeneratedSignal().Connect(
mSlotDelegate, &KeyInputFocusManager::OnKeyEvent
);
}
}
-void KeyInputFocusManager::SetFocus(
Toolkit::Control control
)
+void KeyInputFocusManager::SetFocus(
Toolkit::Control control
)
{
{
- if(
!control
)
+ if(
!control
)
{
// No-op
return;
}
{
// No-op
return;
}
- if(
control == mCurrentFocusControl
)
+ if(
control == mCurrentFocusControl
)
{
// Control already has focus
return;
}
{
// Control already has focus
return;
}
- control.OffS
tageSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlStageDisconnection
);
+ control.OffS
ceneSignal().Connect(mSlotDelegate, &KeyInputFocusManager::OnFocusControlSceneDisconnection
);
Dali::Toolkit::Control previousFocusControl = GetCurrentFocusControl();
Dali::Toolkit::Control previousFocusControl = GetCurrentFocusControl();
- if(
previousFocusControl
)
+ if(
previousFocusControl
)
{
// Notify the control that it has lost key input focus
{
// Notify the control that it has lost key input focus
- GetImplementation(
previousFocusControl
).OnKeyInputFocusLost();
+ GetImplementation(
previousFocusControl
).OnKeyInputFocusLost();
}
// Set control to currentFocusControl
mCurrentFocusControl = control;
// Tell the new actor that it has gained focus.
}
// Set control to currentFocusControl
mCurrentFocusControl = control;
// Tell the new actor that it has gained focus.
- GetImplementation(
control
).OnKeyInputFocusGained();
+ GetImplementation(
control
).OnKeyInputFocusGained();
// Emit the signal to inform focus change to the application.
// Emit the signal to inform focus change to the application.
- if
( !mKeyInputFocusChangedSignal.Empty()
)
+ if
(!mKeyInputFocusChangedSignal.Empty()
)
{
{
- mKeyInputFocusChangedSignal.Emit(
control, previousFocusControl
);
+ mKeyInputFocusChangedSignal.Emit(
control, previousFocusControl
);
}
}
}
}
-void KeyInputFocusManager::RemoveFocus(
Toolkit::Control control
)
+void KeyInputFocusManager::RemoveFocus(
Toolkit::Control control
)
{
{
- if(
control == mCurrentFocusControl
)
+ if(
control == mCurrentFocusControl
)
{
{
- control.OffS
tageSignal().Disconnect( mSlotDelegate, &KeyInputFocusManager::OnFocusControlStageDisconnection
);
+ control.OffS
ceneSignal().Disconnect(mSlotDelegate, &KeyInputFocusManager::OnFocusControlSceneDisconnection
);
// Notify the control that it has lost key input focus
// Notify the control that it has lost key input focus
- GetImplementation(
control
).OnKeyInputFocusLost();
+ GetImplementation(
control
).OnKeyInputFocusLost();
mCurrentFocusControl.Reset();
}
mCurrentFocusControl.Reset();
}
@@
-127,36
+123,36
@@
Toolkit::KeyInputFocusManager::KeyInputFocusChangedSignalType& KeyInputFocusMana
return mKeyInputFocusChangedSignal;
}
return mKeyInputFocusChangedSignal;
}
-bool KeyInputFocusManager::OnKeyEvent(
const KeyEvent& event
)
+bool KeyInputFocusManager::OnKeyEvent(
const KeyEvent& event
)
{
bool consumed = false;
Toolkit::Control control = GetCurrentFocusControl();
{
bool consumed = false;
Toolkit::Control control = GetCurrentFocusControl();
- if(
control
)
+ if(
control
)
{
// Notify the control about the key event
{
// Notify the control about the key event
- consumed = EmitKeyEventSignal(
control, event
);
+ consumed = EmitKeyEventSignal(
control, event
);
}
return consumed;
}
}
return consumed;
}
-bool KeyInputFocusManager::EmitKeyEventSignal(
Toolkit::Control control, const KeyEvent& event
)
+bool KeyInputFocusManager::EmitKeyEventSignal(
Toolkit::Control control, const KeyEvent& event
)
{
bool consumed = false;
{
bool consumed = false;
- if(
control
)
+ if(
control
)
{
{
- consumed = GetImplementation(
control ).EmitKeyEventSignal( event
);
+ consumed = GetImplementation(
control).EmitKeyEventSignal(event
);
// if control doesn't consume KeyEvent, give KeyEvent to its parent.
// if control doesn't consume KeyEvent, give KeyEvent to its parent.
- if(
!consumed
)
+ if(
!consumed
)
{
{
- Toolkit::Control parent = Toolkit::Control::DownCast(
control.GetParent()
);
+ Toolkit::Control parent = Toolkit::Control::DownCast(
control.GetParent()
);
- if(
parent
)
+ if(
parent
)
{
{
- consumed = EmitKeyEventSignal(
parent, event
);
+ consumed = EmitKeyEventSignal(
parent, event
);
}
}
}
}
}
}
@@
-164,22
+160,21
@@
bool KeyInputFocusManager::EmitKeyEventSignal( Toolkit::Control control, const K
return consumed;
}
return consumed;
}
-void KeyInputFocusManager::OnFocusControlS
tageDisconnection( Dali::Actor actor
)
+void KeyInputFocusManager::OnFocusControlS
ceneDisconnection(Dali::Actor actor
)
{
{
- RemoveFocus(
Dali::Toolkit::Control::DownCast( actor )
);
+ RemoveFocus(
Dali::Toolkit::Control::DownCast(actor)
);
}
}
-
-bool KeyInputFocusManager::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
+bool KeyInputFocusManager::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
{
{
- bool
connected( true
);
- KeyInputFocusManager* manager = dynamic_cast<KeyInputFocusManager*>(
object
);
+ bool
connected(true
);
+ KeyInputFocusManager* manager = dynamic_cast<KeyInputFocusManager*>(
object
);
- if(
manager
)
+ if(
manager
)
{
{
- if(
0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_CHANGED )
)
+ if(
0 == strcmp(signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_CHANGED)
)
{
{
- manager->KeyInputFocusChangedSignal().Connect(
tracker, functor
);
+ manager->KeyInputFocusChangedSignal().Connect(
tracker, functor
);
}
else
{
}
else
{