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 "Remove the unused-variable gLogFilter in internal/text/text-font-style.cpp...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Popup.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
index
cd38bc3
..
0b95d1f
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@
-178,14
+178,21
@@
Integration::KeyEvent GenerateKey( const std::string& keyName,
int keyCode,
int keyModifier,
unsigned long timeStamp,
int keyCode,
int keyModifier,
unsigned long timeStamp,
- const Integration::KeyEvent::State& keyState )
+ const Integration::KeyEvent::State& keyState,
+ const std::string& deviceName = "",
+ const DevelDevice::Class::Type& deviceClass = DevelDevice::Class::NONE,
+ const DevelDevice::Subclass::Type& deviceSubclass = DevelDevice::Subclass::NONE
+ )
{
return Integration::KeyEvent( keyName,
keyString,
keyCode,
keyModifier,
timeStamp,
{
return Integration::KeyEvent( keyName,
keyString,
keyCode,
keyModifier,
timeStamp,
- keyState );
+ keyState,
+ deviceName,
+ deviceClass,
+ deviceSubclass );
}
} // Anonymous namespace
}
} // Anonymous namespace
@@
-1425,7
+1432,7
@@
int UtcDaliPopupOnKeyEvent(void)
popup.SetKeyInputFocus();
popup.SetKeyInputFocus();
- application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down ) );
+ application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down
, "", DevelDevice::Class::TOUCH, DevelDevice::Subclass::NONE
) );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();