projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Layouting) Made it easier to add new layouting examples & toggle between all
[platform/core/uifw/dali-demo.git]
/
examples
/
layouting
/
linear-example.h
diff --git
a/examples/layouting/linear-example.h
b/examples/layouting/linear-example.h
index
5779379
..
a1496bb
100644
(file)
--- a/
examples/layouting/linear-example.h
+++ b/
examples/layouting/linear-example.h
@@
-21,6
+21,8
@@
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
+#include "example.h"
+
using namespace Dali;
using namespace Dali::Toolkit;
using namespace Dali;
using namespace Dali::Toolkit;
@@
-32,16
+34,15
@@
namespace Demo
* @brief Example of a Linear Layout with mirror feature and
* tranisition from horizontal to vertical.
*/
* @brief Example of a Linear Layout with mirror feature and
* tranisition from horizontal to vertical.
*/
-class LinearExample
: public ConnectionTracker
+class LinearExample
final: public ConnectionTracker, public Example
{
{
-
public:
// Creates a Linear Layout Example and displays it.
public:
// Creates a Linear Layout Example and displays it.
- v
oid Create()
;
+ v
irtual void Create() override
;
// Remove and destroy this layout
// Remove and destroy this layout
- v
oid Remove()
;
+ v
irtual void Remove() override
;
private:
private:
@@
-55,10
+56,10
@@
private:
PushButton mDirectionButton;
PushButton mRotateButton;
Control mLinearContainer;
PushButton mDirectionButton;
PushButton mRotateButton;
Control mLinearContainer;
- bool mDirection;
+ bool mDirection
= false
;
bool mIsHorizontal = true;
}; // class LinearContainer
} // namespace Demo
bool mIsHorizontal = true;
}; // class LinearContainer
} // namespace Demo
-#endif //DALI_DEMO_LINEAR_CONTAINER_H
\ No newline at end of file
+#endif //DALI_DEMO_LINEAR_CONTAINER_H