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
Added application to test visual transition framework
[platform/core/uifw/dali-demo.git]
/
examples
/
transitions
/
transition-application.h
diff --git
a/examples/transitions/transition-application.h
b/examples/transitions/transition-application.h
index
9d692db
..
f694c8d
100644
(file)
--- a/
examples/transitions/transition-application.h
+++ b/
examples/transitions/transition-application.h
@@
-2,7
+2,7
@@
#define DALI_DEMO_TRANSITION_APPLICATION_H
/*
#define DALI_DEMO_TRANSITION_APPLICATION_H
/*
- * 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.
@@
-19,9
+19,7
@@
// External includes
#include <dali-toolkit/dali-toolkit.h>
// External includes
#include <dali-toolkit/dali-toolkit.h>
-//#include <dali-toolkit/devel-api/controls/slider/slider.h>
-#include <dali-toolkit/devel-api/controls/popup/popup.h>
-#include "beat-control.h"
+#include "shadow-button.h"
#include <cstdio>
#include <sstream>
#include <cstdio>
#include <sstream>
@@
-36,6
+34,9
@@
namespace Demo
class TransitionApplication : public ConnectionTracker
{
public:
class TransitionApplication : public ConnectionTracker
{
public:
+ static const int NUMBER_OF_ACTION_BUTTONS=2;
+
+public:
// Constructor
TransitionApplication( Application& application );
// Constructor
TransitionApplication( Application& application );
@@
-52,15
+53,24
@@
public:
// Key event handler
void OnKeyEvent( const KeyEvent& event );
// Key event handler
void OnKeyEvent( const KeyEvent& event );
- bool OnActionButtonClicked(
Button button
);
+ bool OnActionButtonClicked(
Button button
);
static const char* DEMO_THEME_ONE_PATH;
static const char* DEMO_THEME_ONE_PATH;
+ static const char* DEMO_THEME_TWO_PATH;
private:
private:
+
+ /** Create a visual map
+ *
+ * @param[in] index The index of the visual to create
+ * @param[out] map The map to generate
+ */
+
Application& mApplication;
TextLabel mTitle;
Application& mApplication;
TextLabel mTitle;
- BeatControl mBeatControl;
- PushButton mActionButtons[3];
+ ShadowButton mShadowButton;
+ PushButton mActionButtons[NUMBER_OF_ACTION_BUTTONS];
+ Property::Index mVisualIndex;
Property::Index mActionIndex;
};
Property::Index mActionIndex;
};