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 "Add new layouting support for TextLabel and ImageView." into devel/master
[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
old mode 100644
(file)
new mode 100755
(executable)
index
d3dc69f
..
b190b5f
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-179,7
+179,10
@@
Integration::KeyEvent GenerateKey( const std::string& keyName,
int keyModifier,
unsigned long timeStamp,
const Integration::KeyEvent::State& keyState,
int keyModifier,
unsigned long timeStamp,
const Integration::KeyEvent::State& keyState,
- const std::string& deviceName
+ const std::string& compose = "",
+ const std::string& deviceName = "",
+ const Device::Class::Type& deviceClass = Device::Class::NONE,
+ const Device::Subclass::Type& deviceSubclass = Device::Subclass::NONE
)
{
return Integration::KeyEvent( keyName,
)
{
return Integration::KeyEvent( keyName,
@@
-188,7
+191,10
@@
Integration::KeyEvent GenerateKey( const std::string& keyName,
keyModifier,
timeStamp,
keyState,
keyModifier,
timeStamp,
keyState,
- deviceName);
+ compose,
+ deviceName,
+ deviceClass,
+ deviceSubclass );
}
} // Anonymous namespace
}
} // Anonymous namespace
@@
-1428,7
+1434,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, ""
, "", Device::Class::TOUCH, Device::Subclass::NONE
) );
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();