diff options
| author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-19 16:04:17 +0900 |
|---|---|---|
| committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-19 16:04:17 +0900 |
| commit | abc19fd0503ea3611e28597478fd075db65a8ed4 (patch) | |
| tree | 4c9e486905daadf66624a206d6118a606ce850f2 | |
| parent | d0ac7c976d5f479db26679ec53ea37a2847f6777 (diff) | |
| download | AnimationApp-abc19fd0503ea3611e28597478fd075db65a8ed4.tar.gz AnimationApp-abc19fd0503ea3611e28597478fd075db65a8ed4.tar.bz2 AnimationApp-abc19fd0503ea3611e28597478fd075db65a8ed4.zip | |
sync with master
| -rw-r--r-- | project/inc/MainForm.h | 2 | ||||
| -rw-r--r-- | project/manifest.xml | 2 | ||||
| -rw-r--r-- | project/src/MainForm.cpp | 15 | ||||
| -rw-r--r-- | project/src/Panel1.cpp | 2 | ||||
| -rw-r--r-- | screenshot.png | bin | 5478 -> 5939 bytes |
5 files changed, 18 insertions, 3 deletions
diff --git a/project/inc/MainForm.h b/project/inc/MainForm.h index dde5e46..613819a 100644 --- a/project/inc/MainForm.h +++ b/project/inc/MainForm.h @@ -29,6 +29,7 @@ class MainForm : public Tizen::Ui::Controls::Form , public Tizen::Ui::IActionEventListener + , public Tizen::Ui::Controls::IFormBackEventListener { public: MainForm(void); @@ -40,6 +41,7 @@ public: virtual result OnInitializing(void); virtual result OnTerminating(void); virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId); + virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source); private: static const int ID_BUTTON_START = 101; diff --git a/project/manifest.xml b/project/manifest.xml index 71f1c64..b76ff28 100644 --- a/project/manifest.xml +++ b/project/manifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <Manifest xmlns="http://schemas.tizen.org/2012/12/manifest"> <Id>$(manifestAppId)</Id> - <Version>1.0.0</Version> + <Version>2.0.0</Version> <Type>C++App</Type> <Author/> <Descriptions> diff --git a/project/src/MainForm.cpp b/project/src/MainForm.cpp index 0469f0b..d4fae2a 100644 --- a/project/src/MainForm.cpp +++ b/project/src/MainForm.cpp @@ -36,7 +36,7 @@ MainForm::~MainForm(void) bool MainForm::Initialize(void) { - Form::Construct(FORM_STYLE_NORMAL|FORM_STYLE_INDICATOR|FORM_STYLE_HEADER); + Form::Construct(FORM_STYLE_NORMAL | FORM_STYLE_INDICATOR | FORM_STYLE_HEADER | FORM_STYLE_FOOTER); return true; } @@ -67,6 +67,11 @@ MainForm::OnInitializing(void) pHeader->AddItem(headerItem3); pHeader->AddActionEventListener(*this); } + + Footer* pFooter = GetFooter(); + pFooter->SetBackButton(); + SetFormBackEventListener(this); + Rectangle clientRect= GetClientAreaBounds(); Rectangle rect(0,0,clientRect.width,clientRect.height); @@ -120,3 +125,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId) Draw(); } + +void +MainForm::OnFormBackRequested(Form& source) +{ + UiApp* pApp = UiApp::GetInstance(); + AppAssert(pApp); + pApp->Terminate(); +} diff --git a/project/src/Panel1.cpp b/project/src/Panel1.cpp index ed562d9..e736108 100644 --- a/project/src/Panel1.cpp +++ b/project/src/Panel1.cpp @@ -202,7 +202,7 @@ Panel1::Construct(Tizen::Graphics::Rectangle rect) // Create Animation __pAnimation = new (std::nothrow) Animation(); - __pAnimation->Construct(Rectangle((rect.width/2-56/2), (rect.height/2-56/2), 56, 56), *__pAnimationFrameList); + __pAnimation->Construct(Rectangle((rect.width/2-60/2), (rect.height/2-60/2), 60, 60), *__pAnimationFrameList); __pAnimation->SetRepeatCount(10000); AddControl(*__pAnimation); diff --git a/screenshot.png b/screenshot.png Binary files differindex 88c0cf6..fbe87c0 100644 --- a/screenshot.png +++ b/screenshot.png |
