summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkeonpyo.kong <keonpyo.kong@samsung.com>2013-04-16 17:54:18 +0900
committerkeonpyo.kong <keonpyo.kong@samsung.com>2013-04-16 17:54:18 +0900
commit737573332b3890bc6f26ff74531cc639d8e4ed9a (patch)
tree6f200b39a9b11f9f0a7985dec24fe639d46d9e3d
parent7067e38f09c559f9d9dac8a99675a53d41463e56 (diff)
downloadUiFrameMode-737573332b3890bc6f26ff74531cc639d8e4ed9a.tar.gz
UiFrameMode-737573332b3890bc6f26ff74531cc639d8e4ed9a.tar.bz2
UiFrameMode-737573332b3890bc6f26ff74531cc639d8e4ed9a.zip
update UiFrameMode
Change-Id: Ie8308f94c57b114e5b3d77c403934d362d520ede Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
-rw-r--r--project/inc/UiFrameModeForm.h1
-rw-r--r--project/res/nofile.dummy0
-rw-r--r--project/res/screen-density-xhigh/moreicon.pngbin0 -> 3604 bytes
-rw-r--r--project/src/UiFrameModeForm.cpp12
-rw-r--r--screenshot.pngbin11512 -> 9671 bytes
5 files changed, 9 insertions, 4 deletions
diff --git a/project/inc/UiFrameModeForm.h b/project/inc/UiFrameModeForm.h
index 9878635..2a35b05 100644
--- a/project/inc/UiFrameModeForm.h
+++ b/project/inc/UiFrameModeForm.h
@@ -59,6 +59,7 @@ private:
Tizen::Ui::Controls::Button* __pButton;
Tizen::Ui::Controls::ContextMenu* __pContextMenu;
LabelTouchEventListener* __pLabelTouchListener;
+ Tizen::Graphics::Bitmap* __pLeftItemBitmap;
}; // UiFrameModeForm
#endif // _UI_FRAME_MODE_FORM_H_
diff --git a/project/res/nofile.dummy b/project/res/nofile.dummy
deleted file mode 100644
index e69de29..0000000
--- a/project/res/nofile.dummy
+++ /dev/null
diff --git a/project/res/screen-density-xhigh/moreicon.png b/project/res/screen-density-xhigh/moreicon.png
new file mode 100644
index 0000000..8458dea
--- /dev/null
+++ b/project/res/screen-density-xhigh/moreicon.png
Binary files differ
diff --git a/project/src/UiFrameModeForm.cpp b/project/src/UiFrameModeForm.cpp
index fba444c..4c8fec9 100644
--- a/project/src/UiFrameModeForm.cpp
+++ b/project/src/UiFrameModeForm.cpp
@@ -114,6 +114,7 @@ UiFrameModeForm::UiFrameModeForm(void)
, __pButton(null)
, __pContextMenu(null)
, __pLabelTouchListener(null)
+ , __pLeftItemBitmap(null)
{
}
@@ -171,6 +172,9 @@ UiFrameModeForm::OnInitializing(void)
SetOrientation(ORIENTATION_AUTOMATIC_FOUR_DIRECTION);
AddOrientationEventListener(*this);
+ AppResource* pAppResource = Application::GetInstance()->GetAppResource();
+ __pLeftItemBitmap = pAppResource->GetBitmapN(L"moreicon.png");
+
SetHeader();
SetFooter();
@@ -180,7 +184,7 @@ UiFrameModeForm::OnInitializing(void)
__pContextMenu = new (std::nothrow) ContextMenu();
__pContextMenu->Construct(FloatPoint(10.0f, rect.height - pFooter->GetHeightF()), CONTEXT_MENU_STYLE_LIST);
- __pContextMenu->AddItem(L"Change to floating mode", ID_CONTEXT_ITEM);
+ __pContextMenu->AddItem(L"Minimize", ID_CONTEXT_ITEM);
__pContextMenu->AddActionEventListener(*this);
return r;
}
@@ -256,8 +260,8 @@ UiFrameModeForm::SetFooter(void)
SetFormBackEventListener(this);
ButtonItem buttonLeftItem;
- buttonLeftItem.Construct(BUTTON_ITEM_STYLE_TEXT, ID_BUTTON_ITEM);
- buttonLeftItem.SetText(L"More");
+ buttonLeftItem.Construct(BUTTON_ITEM_STYLE_ICON, ID_BUTTON_ITEM);
+ buttonLeftItem.SetIcon(BUTTON_ITEM_STATUS_NORMAL, __pLeftItemBitmap);
pFooter->SetButton(BUTTON_POSITION_LEFT, buttonLeftItem);
}
@@ -338,7 +342,7 @@ result
UiFrameModeForm::OnTerminating(void)
{
result r = E_SUCCESS;
-
+ delete __pLeftItemBitmap;
return r;
}
diff --git a/screenshot.png b/screenshot.png
index a6f3b5f..d9faaff 100644
--- a/screenshot.png
+++ b/screenshot.png
Binary files differ