Merge branch 'tizen_2.1' into devgfx
authorSungyeon Woo <s.woo@samsung.com>
Mon, 13 May 2013 07:26:38 +0000 (16:26 +0900)
committerSungyeon Woo <s.woo@samsung.com>
Mon, 13 May 2013 07:26:45 +0000 (16:26 +0900)
Change-Id: I64095245ed4fb2f232368c408888fa943d1499de

197 files changed:
inc/FUiAnimVisualElement.h
inc/FUiAnimations.h
inc/FUiCardLayout.h
inc/FUiClipboard.h
inc/FUiCtrlAnimation.h
inc/FUiCtrlButton.h
inc/FUiCtrlCheckButton.h
inc/FUiCtrlColorPicker.h
inc/FUiCtrlContextMenu.h
inc/FUiCtrlCustomList.h
inc/FUiCtrlDateTimePicker.h
inc/FUiCtrlEditArea.h
inc/FUiCtrlEditDate.h
inc/FUiCtrlEditField.h
inc/FUiCtrlEditTime.h
inc/FUiCtrlExpandableEditArea.h
inc/FUiCtrlExpandableList.h
inc/FUiCtrlGallery.h
inc/FUiCtrlGroupedList.h
inc/FUiCtrlGroupedListView.h
inc/FUiCtrlGroupedTableView.h
inc/FUiCtrlIGalleryItemProvider.h
inc/FUiCtrlIGroupedListViewItemProvider.h
inc/FUiCtrlIGroupedListViewItemProviderF.h
inc/FUiCtrlIGroupedTableViewItemProvider.h
inc/FUiCtrlIGroupedTableViewItemProviderF.h
inc/FUiCtrlIIconListViewItemProvider.h
inc/FUiCtrlIListViewItemProvider.h
inc/FUiCtrlIListViewItemProviderF.h
inc/FUiCtrlISectionTableViewItemProvider.h
inc/FUiCtrlISectionTableViewItemProviderF.h
inc/FUiCtrlITableViewItemProvider.h
inc/FUiCtrlITableViewItemProviderF.h
inc/FUiCtrlIconList.h
inc/FUiCtrlIconListView.h
inc/FUiCtrlKeypad.h
inc/FUiCtrlLabel.h
inc/FUiCtrlList.h
inc/FUiCtrlListView.h
inc/FUiCtrlMessageBox.h
inc/FUiCtrlOverlayRegion.h
inc/FUiCtrlPanel.h
inc/FUiCtrlPopup.h
inc/FUiCtrlProgress.h
inc/FUiCtrlProgressPopup.h
inc/FUiCtrlRadioGroup.h
inc/FUiCtrlScrollPanel.h
inc/FUiCtrlSearchBar.h
inc/FUiCtrlSectionTableView.h
inc/FUiCtrlSlidableGroupedList.h
inc/FUiCtrlSlidableList.h
inc/FUiCtrlSlider.h
inc/FUiCtrlSplitPanel.h
inc/FUiCtrlTabBar.h
inc/FUiCtrlTableView.h
inc/FUiCtrlTextBox.h
inc/FUiDataBindingContext.h
inc/FUiGridLayout.h
inc/FUiHorizontalBoxLayout.h
inc/FUiRelativeLayout.h
inc/FUiVerticalBoxLayout.h
res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_bottom.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_center.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_top.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_bottom.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_center.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_top.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_top_ef.#.png [new file with mode: 0644]
src/app/FApp_AppResourceBitmapUtil.cpp
src/app/FApp_UiAppImpl.cpp
src/graphics/FGrp_EnrichedTextImpl.cpp
src/graphics/FGrp_TextElementImpl.cpp
src/graphics/inc/FGrp_TextCommon.h
src/graphics/inc/FGrp_TextElementImpl.h
src/graphics/opengl/FGrpEgl.cpp
src/graphics/text/FGrp_TextTextComposite.cpp
src/graphics/text/FGrp_TextTextCutLinkParser.cpp
src/graphics/text/FGrp_TextTextObject.cpp
src/graphics/text/FGrp_TextTextSimple.cpp
src/ui/FUi_AccessibilityContainer.cpp
src/ui/FUi_AccessibilityContainerImpl.cpp
src/ui/FUi_AccessibilityElement.cpp
src/ui/FUi_AccessibilityElementImpl.cpp
src/ui/FUi_AccessibilityManager.cpp
src/ui/FUi_Control.cpp
src/ui/FUi_ControlImpl.cpp
src/ui/FUi_ControlImplManager.cpp
src/ui/FUi_EcoreEvas.cpp
src/ui/FUi_TouchGestureTimerManager.cpp
src/ui/FUi_TouchManager.cpp
src/ui/FUi_Window.cpp
src/ui/animations/FUiAnim_AnimationManager.cpp
src/ui/animations/FUiAnim_DisplayManager.cpp
src/ui/animations/FUiAnim_VisualElementImpl.cpp
src/ui/controls/FUiCtrlSplitPanel.cpp
src/ui/controls/FUiCtrl_CheckButton.cpp
src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
src/ui/controls/FUiCtrl_ContextMenuItem.cpp
src/ui/controls/FUiCtrl_DateTimeBar.cpp
src/ui/controls/FUiCtrl_Edit.cpp
src/ui/controls/FUiCtrl_EditDatePresenter.cpp
src/ui/controls/FUiCtrl_EditPresenter.cpp
src/ui/controls/FUiCtrl_EditTime.cpp
src/ui/controls/FUiCtrl_EditTimePresenter.cpp
src/ui/controls/FUiCtrl_FastScrollPresenter.cpp
src/ui/controls/FUiCtrl_Gallery.cpp
src/ui/controls/FUiCtrl_GroupedListViewImpl.cpp
src/ui/controls/FUiCtrl_Indicator.cpp
src/ui/controls/FUiCtrl_Label.cpp
src/ui/controls/FUiCtrl_ListViewImpl.cpp
src/ui/controls/FUiCtrl_ListViewModel.cpp
src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
src/ui/controls/FUiCtrl_OptionMenu.cpp
src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
src/ui/controls/FUiCtrl_OverlayAgent.cpp
src/ui/controls/FUiCtrl_OverlayRegionImpl.cpp
src/ui/controls/FUiCtrl_PanelImpl.cpp
src/ui/controls/FUiCtrl_Popup.cpp
src/ui/controls/FUiCtrl_PopupPresenter.cpp
src/ui/controls/FUiCtrl_ProgressPopupPresenter.cpp
src/ui/controls/FUiCtrl_ScrollPanel.cpp
src/ui/controls/FUiCtrl_ScrollPanelImpl.cpp
src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp
src/ui/controls/FUiCtrl_SliderPresenter.cpp
src/ui/controls/FUiCtrl_SplitPanel.cpp
src/ui/controls/FUiCtrl_Tab.cpp
src/ui/controls/FUiCtrl_TabBar.cpp
src/ui/controls/FUiCtrl_TabBarPresenter.cpp
src/ui/controls/FUiCtrl_TableViewItem.cpp
src/ui/controls/FUiCtrl_TableViewPresenter.cpp
src/ui/controls/FUiCtrl_TokenEdit.cpp
src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
src/ui/controls/FUiCtrl_Toolbar.cpp
src/ui/inc/FUiAnim_VisualElementImpl.h
src/ui/inc/FUiCtrl_ColorPicker.h
src/ui/inc/FUiCtrl_DateTimeBar.h
src/ui/inc/FUiCtrl_DateTimePicker.h
src/ui/inc/FUiCtrl_Edit.h
src/ui/inc/FUiCtrl_EditPresenter.h
src/ui/inc/FUiCtrl_EditTime.h
src/ui/inc/FUiCtrl_OverlayAgent.h
src/ui/inc/FUiCtrl_Popup.h
src/ui/inc/FUiCtrl_ScrollPanel.h
src/ui/inc/FUiCtrl_ScrollPanelPresenter.h
src/ui/inc/FUiCtrl_Slider.h
src/ui/inc/FUiCtrl_SplitPanel.h
src/ui/inc/FUiCtrl_Tab.h
src/ui/inc/FUiCtrl_TabBar.h
src/ui/inc/FUiCtrl_TabBarPresenter.h
src/ui/inc/FUiCtrl_TableViewItem.h
src/ui/inc/FUiCtrl_TableViewPresenter.h
src/ui/inc/FUiCtrl_TokenEditPresenter.h
src/ui/inc/FUi_AccessibilityContainer.h
src/ui/inc/FUi_AccessibilityContainerImpl.h
src/ui/inc/FUi_ControlImpl.h
src/ui/inc/FUi_ControlImplManager.h
src/ui/inc/FUi_IAccessibilityListener.h
src/ui/inc/FUi_ResourceCheckButtonConfig.h
src/ui/inc/FUi_ResourceEditConfig.h
src/ui/inc/FUi_ResourceSliderConfig.h
src/ui/inc/FUi_ResourceTableViewConfig.h
src/ui/inc/FUi_Window.h
src/ui/resource/FUi_ResourceCheckButtonConfig.cpp
src/ui/resource/FUi_ResourceConfigParser.cpp
src/ui/resource/FUi_ResourceEditConfig.cpp
src/ui/resource/FUi_ResourceSliderConfig.cpp
src/ui/resource/FUi_ResourceTableViewConfig.cpp
src/ui/scenes/FUiScenes_SceneManagerImpl.cpp

index af380a1..f9897c6 100644 (file)
@@ -1067,8 +1067,7 @@ public:
         * @return              An error code
         * @param[in]   transform                       The transform matrix
         * @exception   E_SUCCESS                       The method is successful.
-        * @exception   E_INVALID_ARG           The input parameter is incorrect. @n
-        *                              The E_INVALID_ARG exception occurs when the specified @c transform is not invertible.
+        * @exception   E_INVALID_ARG           The input parameter is incorrect.
         * @see                 GetTransformMatrix()
         */
        result SetTransformMatrix(const Tizen::Graphics::FloatMatrix4& transform);
@@ -1092,8 +1091,7 @@ public:
         * @return              An error code
         * @param[in]   transform                       The transform matrix
         * @exception   E_SUCCESS                       The method is successful.
-        * @exception   E_INVALID_ARG           The input parameter is incorrect. @n
-        *                              The E_INVALID_ARG exception occurs when the specified @c transform is not invertible.
+        * @exception   E_INVALID_ARG           The input parameter is incorrect.
         * @see                 GetChildrenTransformMatrix()
         */
        result SetChildrenTransformMatrix(const Tizen::Graphics::FloatMatrix4& transform);
index 1223b4e..043ef54 100644 (file)
@@ -134,7 +134,7 @@ AnimationSample::OnInitializing(void)
        __pButton->SetText(L"Start animation");
        __pButton->SetActionId(ID_BUTTON);
        __pButton->AddActionEventListener(*this);
-       AddControl(*__pButton);
+       AddControl(__pButton);
 
        return r;
 }
@@ -193,11 +193,11 @@ FrameAnimatorSample::OnAppInitializing(AppRegistry& appRegistry)
 
        // Adds forms to the frame
        Frame *pFrame = GetAppFrame()->GetFrame();
-       pFrame->AddControl(*pForm1);
-       pFrame->AddControl(*pForm2);
+       pFrame->AddControl(pForm1);
+       pFrame->AddControl(pForm2);
 
        // Sets the current form
-       pFrame->SetCurrentForm(*pForm1);
+       pFrame->SetCurrentForm(pForm1);
 
        // Display the form
        pForm1->Invalidate();
@@ -225,7 +225,7 @@ Form1::OnActionPerformed(const Control& source, int actionId)
                                pFrameAnimator->SetFormTransitionAnimation (FRAME_ANIMATOR_FORM_TRANSITION_ANIMATION_TRANSLATE_LEFT,
                                                                                                                        1000,
                                                                                                                        ANIMATION_INTERPOLATOR_LINEAR );
-                               r = pFrameAnimator->SetCurrentForm (*nextForm);
+                               r = pFrameAnimator->SetCurrentForm (nextForm);
                                if (IsFailed(r))
                                {
                                        AppLog("SetCurrentForm on the Form2 Failed.\n");
@@ -258,7 +258,7 @@ Form2::OnActionPerformed(const Control& source, int actionId)
                                pFrameAnimator->SetFormTransitionAnimation(FRAME_ANIMATOR_FORM_TRANSITION_ANIMATION_TRANSLATE_RIGHT,
                                                                                                                   1000,
                                                                                                                   ANIMATION_INTERPOLATOR_LINEAR );
-                               r = pFrameAnimator->SetCurrentForm (*nextForm);
+                               r = pFrameAnimator->SetCurrentForm (nextForm);
                                if (IsFailed(r))
                                {
                                        AppLog("SetCurrentForm on the Form1 Failed.\n");
@@ -312,7 +312,7 @@ VisualElementSample::OnInitializing(void)
        __pRect->SetShowState(true);
        __pRect->SetContentProvider(this);
 
-       GetVisualElement()->AttachChild(*__pRect);
+       GetVisualElement()->AttachChild(__pRect);
        __pRect->InvalidateRectangle(null);
 
        return E_SUCCESS;
index 4a35d8d..3c5fe4e 100644 (file)
@@ -55,6 +55,7 @@ public:
  *     @code
 // Sample code for CardLayoutSample.cpp
 #include <FGraphics.h>
+#include <FUiCardLayout.h>
 
 #include "CardLayoutSample.h"
 
@@ -77,7 +78,7 @@ CardLayoutSample::Initialize(void)
 result
 CardLayoutSample::OnInitializing(void)
 {
-       result = E_SUCCESS;
+       result = E_SUCCESS;
 
        // Creates an instance of 1st panel
        Panel* pFirstPanel = new Panel();
@@ -85,7 +86,7 @@ CardLayoutSample::OnInitializing(void)
        pFirstPanel->SetBackgroundColor(Color(0xFF, 0x40, 0x40, 0xFF));
 
        // Adds the 1st panel to the form
-       AddControl(*pFirstPanel);
+       AddControl(pFirstPanel);
 
        // Creates an instance of 2nd panel
        Panel* pSecondPanel = new Panel();
@@ -93,7 +94,7 @@ CardLayoutSample::OnInitializing(void)
        pSecondPanel->SetBackgroundColor(Color(0x40, 0x40, 0xFF, 0xFF));
 
        // Adds the 2nd panel to the form
-       AddControl(*pSecondPanel);
+       AddControl(pSecondPanel);
 
        return r;
 }
index f8bc28a..5ad4d93 100644 (file)
@@ -116,11 +116,11 @@ ClipboardSample::OnInitializing(void)
        pButton->Construct(Rectangle(50, 50, 200, 80), "COPY");
        pButton->SetActionId(ID_BUTTON_OK);
        pButton->AddActionEventListener(*this);
-       AddControl(*pButton);
+       AddControl(pButton);
 
        __pLabel = new Label();
        __pLabel->Construct(Rectangle(0, 200, GetClientAreaBounds().width, 80), L"..");
-       AddControl(*__pLabel);
+       AddControl(__pLabel);
 
        return r;
 }
index 033832f..a0ce8db 100644 (file)
@@ -146,7 +146,7 @@ AnimationSample::OnInitializing(void)
        pAnimation->AddAnimationEventListener(*this);
 
        // Adds the animation to the form
-       AddControl(*pAnimation);
+       AddControl(pAnimation);
 
        // Plays the animation
        pAnimation->Play();
index c76acfa..97d959d 100644 (file)
@@ -121,7 +121,7 @@ ButtonSample::OnInitializing(void)
        __pButton->SetActionId(ID_BUTTON);
        __pButton->AddActionEventListener(*this);
 
-       AddControl(*__pButton);
+       AddControl(__pButton);
 
        // Creates an instance of Button for bitmap button
        __pBitmapButton = new Button();
@@ -143,7 +143,7 @@ ButtonSample::OnInitializing(void)
        delete pBitmapPressed;
 
        // Adds the bitmap button to the form
-       AddControl(*__pBitmapButton);
+       AddControl(__pBitmapButton);
 
        return r;
 }
index 8a21339..a8397cc 100644 (file)
@@ -144,7 +144,7 @@ CheckButtonSample::OnInitializing(void)
        __pCheckButton->AddActionEventListener(*this);
 
        // Add a CheckButton to the Form
-       AddControl(*__pCheckButton);
+       AddControl(__pCheckButton);
 
        return r;
 }
index 935d4ad..6c7770e 100644 (file)
@@ -94,7 +94,7 @@ ColorPickerSample::OnInitializing(void)
        __pColorPicker->AddColorChangeEventListener(*this);
 
        // Adds the color picker to the form
-       AddControl(*__pColorPicker);
+       AddControl(__pColorPicker);
 
        return r;
 }
index 9d5324c..2c4351c 100644 (file)
@@ -165,7 +165,7 @@ ContextMenuSample::OnInitializing(void)
        pButton->AddActionEventListener(*this);
 
        // Adds the button to the form
-       AddControl(*pButton);
+       AddControl(pButton);
 
        return r;
 }
index f2ff373..ab9ca49 100644 (file)
@@ -193,7 +193,7 @@ CustomListSample::OnInitializing(void)
        }
 
        // Adds the custom list to the form
-       AddControl(*__pCustomList);
+       AddControl(__pCustomList);
 
        // Deallocates bitmaps
        delete pBitmapNormal;
index 758f46b..ce3e9dd 100644 (file)
@@ -104,7 +104,7 @@ DateTimePickerSample::OnInitializing(void)
        pButton->AddActionEventListener(*this);
 
        // Adds the button to the form
-       AddControl(*pButton);
+       AddControl(pButton);
 
        // Creates an instance of DateTimePicker
        __pDateTimePicker = new DateTimePicker();
index db87e2f..424e69d 100644 (file)
@@ -117,7 +117,7 @@ EditAreaSample::OnInitializing(void)
        __pEditArea->AddTextEventListener(*this);
 
        // Adds the edit area to the form
-       AddControl(*__pEditArea);
+       AddControl(__pEditArea);
 
        return r;
 }
index dce7ff4..d335d14 100644 (file)
@@ -96,7 +96,7 @@ EditDateSample::OnInitializing(void)
        __pEditDate->AddDateChangeEventListener(*this);
 
        // Adds an instance of IDateChangeEventListener
-       AddControl(*__pEditDate);
+       AddControl(__pEditDate);
 
        return r;
 }
index 1d2a0a4..d1f5abe 100644 (file)
@@ -117,7 +117,7 @@ EditFieldSample::OnInitializing(void)
        __pEditField->AddTextEventListener(*this);
 
        //Adds the edit field to the Form
-       AddControl(*__pEditField);
+       AddControl(__pEditField);
 
        return r;
 }
index f67ee8b..b3e1457 100644 (file)
@@ -96,7 +96,7 @@ EditTimeSample::OnInitializing(void)
        __pEditTime->AddTimeChangeEventListener(*this);
 
        //Adds the edit time to the form
-       AddControl(*__pEditTime);
+       AddControl(__pEditTime);
 
        return r;
 }
index 8a349eb..165a29a 100644 (file)
@@ -165,7 +165,7 @@ ExpandableEditAreaSample::OnInitializing(void)
        __pExpandableEdit->AddKeypadEventListener(*this);
        __pExpandableEdit->AddExpandableEditAreaEventListener(*this);
 
-       AddControl(*__pExpandableEdit);
+       AddControl(__pExpandableEdit);
 
        // Sets a focus to the expandable edit area
        __pExpandableEdit->SetFocus();
index 08d96c3..3f28c2b 100644 (file)
@@ -162,7 +162,7 @@ ExpandableListSample::OnInitializing(void)
        AddListSubItem(*pExpandableList, ID_LIST_MAINITEM, L"SubItem");
 
        // Adds the expandable list to the form
-       AddControl(*pExpandableList);
+       AddControl(pExpandableList);
 
        // Deallocates bitmaps
        delete pBitmapNormal;
index 323bc22..995db09 100644 (file)
@@ -116,7 +116,7 @@ GallerySample::OnInitializing(void)
        __pGallery->SetItemProvider(*this);
        __pGallery->AddGalleryEventListener(*this);
 
-       AddControl(*__pGallery);
+       AddControl(__pGallery);
 
        return r;
 }
index 9066b2a..1b7b546 100644 (file)
@@ -163,7 +163,7 @@ GroupedListSample::OnInitializing(void)
        }
 
        // Adds the grouped list to the form
-       AddControl(*__pGroupedList);
+       AddControl(__pGroupedList);
 
        // Deallocates bitmaps
        delete pBitmapNormal;
index 1da631f..8ee1530 100644 (file)
@@ -172,7 +172,7 @@ GroupedListViewSample::OnInitializing(void)
        __pGroupedListView->AddGroupedListViewItemEventListener(*this);
 
        // Adds the icon list view to the form
-       AddControl(*__pGroupedListView);
+       AddControl(__pGroupedListView);
 
        // Creates an instance of ListContextItem
        __pItemContext = new ListContextItem();
index 8a5bbfb..62b2049 100644 (file)
@@ -124,14 +124,14 @@ GroupedTableViewSample::OnInitializing(void)
        // Creates an instance of TableView
        __pGroupedTableView = new GroupedTableView();
        __pGroupedTableView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height), true, TABLE_VIEW_SCROLL_BAR_STYLE_FAST_SCROLL);
-       __pGroupedTableView->SetItemProvider(*this);
+       __pGroupedTableView->SetItemProvider(this);
        __pGroupedTableView->AddGroupedTableViewItemEventListener(*this);
 
        __pGroupedTableView->AddFastScrollListener(*this);
        __pGroupedTableView->SetFastScrollIndex(L"ABCDEFGHIJKLMNOPQRSTUVWXYZ", true);
 
        // Adds the TableView to the form
-       AddControl(*__pGroupedTableView);
+       AddControl(__pGroupedTableView);
 
        // Creates an instance of TableViewContextItem
        __pContextItem = new TableViewContextItem();
@@ -143,8 +143,8 @@ GroupedTableViewSample::OnInitializing(void)
        Button* pButton2 = new Button();
        pButton2->Construct(Rectangle(250, 10, 200, 80), L"Context2");
 
-       __pContextItem->AddControl(*pButton);
-       __pContextItem->AddControl(*pButton2);
+       __pContextItem->AddControl(pButton);
+       __pContextItem->AddControl(pButton2);
 
        return r;
 }
@@ -155,8 +155,8 @@ GroupedTableViewSample::OnTerminating(void)
        result r = E_SUCCESS;
 
        // Deallocates the item context
-       delete __pItemContext;
-       __pItemContext = null;
+       delete __pContextItem;
+       __pContextItem = null;
 
        return r;
 }
@@ -229,9 +229,9 @@ GroupedTableViewSample::CreateGroupItem(int groupIndex, int itemWidth)
        text.Format(30, L"Group title %d", groupIndex);
 
        Label* pLabel = new Label();
-       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultGroupItemHeight(), text);
+       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultGroupItemHeight()), text);
 
-       pItem->AddControl(*pLable);
+       pItem->AddControl(pLabel);
 
        return pItem;
 }
@@ -286,16 +286,16 @@ GroupedTableViewSample::CreateItem(int groupIndex, int itemIndex, int itemWidth)
        text.Format(30, L"TableViewItem %d", itemIndex);
 
        Label* pLabel = new Label();
-       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultItemHeight(), text);
+       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultItemHeight()), text);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
        pItem->SetContextItem(__pContextItem);
 
        return pItem;
 }
 
 bool
-GroupedTableViewSample::DeleteItem(int groupIndex, int itemIndex, Controls::TableViewItem* pItem)
+GroupedTableViewSample::DeleteItem(int groupIndex, int itemIndex, TableViewItem* pItem)
 {
        pItem->Destroy();
 
@@ -303,7 +303,7 @@ GroupedTableViewSample::DeleteItem(int groupIndex, int itemIndex, Controls::Tabl
 }
 
 void
-GroupedTableViewSample::UpdateItem(int groupIndex, int itemIndex, Controls::TableViewItem* pItem)
+GroupedTableViewSample::UpdateItem(int groupIndex, int itemIndex, TableViewItem* pItem)
 {
        // ....
 }
index e3ad4cc..5902192 100644 (file)
@@ -74,6 +74,7 @@ public:
         * @remarks             An application that uses the Gallery control must implement this method. This method is expected to return an item that is allocated on a
         *                              heap memory. The returned item can be of type GalleryItem. Note that when the item is not required, the Gallery control calls the
         *                              IGalleryItemProvider::DeleteItem() method.
+        *                              The returned item should not be a null pointer.
         */
        virtual Tizen::Ui::Controls::GalleryItem* CreateItem(int index) = 0;
 
index 69db10c..feb7086 100644 (file)
@@ -93,6 +93,7 @@ public:
         *                      allocated on a heap memory.
         *                      - Note that when the item is not required, the GroupedListView control calls %IGroupedListViewItemProvider::DeleteGroupItem() and the
         *                      application deallocates the item.
+        *                      - The returned item should not be a null pointer.
         */
        virtual Tizen::Ui::Controls::GroupItem* CreateGroupItem(int groupIndex, int itemWidth) = 0;
 
index 79044c8..241c172 100644 (file)
@@ -92,6 +92,7 @@ public:
         *                      allocated on a heap memory.
         *                      - Note that when the item is not required, the GroupedListView control calls IGroupedListViewItemProvider::DeleteGroupItem() and the
         *                      application deallocates the item.
+        *                      - The returned item should not be a null pointer.
         */
        virtual Tizen::Ui::Controls::GroupItem* CreateGroupItem(int groupIndex, float itemWidth) = 0;
 
index 08b616a..19b8dfa 100644 (file)
@@ -87,6 +87,7 @@ public:
        *                       allocated on a heap memory.
        *                       - Note that when the group item is not required, the %GroupedTableView control calls IGroupedTableViewItemProvider::DeleteGroupItem() and the
        *                       application deallocates the item.
+        *                      - The returned item should not be a null pointer.
        */
        virtual TableViewGroupItem* CreateGroupItem(int groupIndex, int itemWidth) = 0;
 
index 6e1b81a..1a00f7c 100644 (file)
@@ -87,6 +87,7 @@ public:
        *                       allocated on a heap memory.
        *                       - Note that when the group item is not required, the %GroupedTableView control calls IGroupedTableViewItemProviderF::DeleteGroupItem() and the
        *                       application deallocates the item.
+        *                      - The returned item should not be a null pointer.
        */
        virtual TableViewGroupItem* CreateGroupItem(int groupIndex, float itemWidth) = 0;
 
index 6fe59a2..6f41407 100644 (file)
@@ -76,7 +76,8 @@ public:
         * @param[in] index                     The index of the item
         * @remarks  Applications that use IconListView must implement this method. This method is expected to return an item that is allocated in a heap
         *                      memory. The returned item can be IconListViewItem. Note that, when the item becomes unnecessary, the %IconListView calls
-        *                      DeleteItem() and applications are in charge of deallocating the item.
+        *                      DeleteItem() and applications are in charge of deallocating the item. @n
+        *                      The returned item should not be a null pointer.
         *
         */
        virtual Tizen::Ui::Controls::IconListViewItem* CreateItem(int index) = 0;
index 8c80312..e682124 100644 (file)
@@ -79,6 +79,7 @@ public:
         *                      - The applications that use ListView must implement this method.
         *                      - This method is expected to return an item which is allocated in a heap memory.
         *                      - The returned item can be a SimpleItem or CustomItem.
+        *                      - The returned item should not be a null pointer.
         *                      - Note that when the item becomes unnecessary, the ListView calls IListViewItemProvider::DeleteItem() and the application is in charge of
         *                      deallocating the item.
         * @see     DeleteItem()
index 157bd58..fc8322a 100644 (file)
@@ -79,6 +79,7 @@ public:
         *                      - The applications that use ListView must implement this method.
         *                      - This method is expected to return an item which is allocated in a heap memory.
         *                      - The returned item can be a SimpleItem or CustomItem.
+        *                      - The returned item should not be a null pointer.
         *                      - Note that when the item becomes unnecessary, the %ListView calls IListViewItemProvider::DeleteItem() and the application is in charge of
         *                              deallocating the item.
         * @see     DeleteItem()
index ffd6918..19a0caa 100644 (file)
@@ -86,6 +86,7 @@ public:
        *                       - An application that uses the SectionTableView control must implement this method.
        *                       - This method is expected to return an item that is allocated on a heap memory.
        *                       - The returned item can be a simple or custom item.
+       *                       - The returned item should not be a null pointer.
        *                       - Note that when the item is not required, the %SectionTableView control calls ISectionTableViewItemProvider::DeleteItem() and the application
        *                       deallocates the item.
        * @see     DeleteItem()
index e28c310..1e08eeb 100644 (file)
@@ -86,6 +86,7 @@ public:
        *                       - An application that uses the SectionTableView control must implement this method.
        *                       - This method is expected to return an item that is allocated on a heap memory.
        *                       - The returned item can be a simple or custom item.
+       *                       - The returned item should not be a null pointer.
        *                       - Note that when the item is not required, the %SectionTableView control calls ISectionTableViewItemProviderF::DeleteItem() and the application
        *                       deallocates the item.
        * @see     DeleteItem()
index 7684a4a..97c7e9d 100644 (file)
@@ -75,6 +75,7 @@ public:
        *                       - An application that uses the TableView control must implement this method.
        *                       - This method is expected to return an item that is allocated on a heap memory.
        *                       - The returned item can be a %TableViewItem or a class derived from TableViewItem.
+       *                       - The returned item should not be a null pointer.
        *                       - Note that when the item is not required, the %TableView control calls ITableViewItemProvider::DeleteItem(),
        *                       allowing the application to deallocate the item.
        * @see           DeleteItem()
index 6109270..4f4a7f7 100644 (file)
@@ -75,6 +75,7 @@ public:
        *                       - An application that uses the TableView control must implement this method.
        *                       - This method is expected to return an item that is allocated on a heap memory.
        *                       - The returned item can be a %TableViewItem or a class derived from TableViewItem.
+       *                       - The returned item should not be a null pointer.
        *                       - Note that when the item is not required, the %TableView control calls ITableViewItemProvider::DeleteItem(),
        *                       allowing the application to deallocate the item.
        * @see           DeleteItem()
index c92a74b..cc4ee9a 100644 (file)
@@ -146,7 +146,7 @@ IconListSample::OnInitializing(void)
        __pIconList->AddItem(&itemText2, pBitmapNormal2, pBitmapFocused2, ID_LIST_SECONDITEM);
 
        // Adds the icon list to the form
-       AddControl(*__pIconList);
+       AddControl(__pIconList);
 
        // Deallocates bitmaps
        delete pBitmapNormal1;
index 262f349..43eff35 100644 (file)
@@ -120,7 +120,7 @@ IconListViewSample::OnInitializing(void)
        __pIconListView->AddIconListViewItemEventListener(*this);
 
        // Adds the icon list view to the form
-       AddControl(*__pIconListView);
+       AddControl(__pIconListView);
 
        // Gets instances of Bitmap
        AppResource* pAppResource = Application::GetInstance()->GetAppResource();
index cc2a7ca..01fa874 100644 (file)
@@ -121,7 +121,7 @@ KeypadSample::OnInitializing(void)
        pButton->Construct(Rectangle(50, 50, 150, 150), L"Show Keypad");
        pButton->SetActionId(ID_BUTTON);
        pButton->AddActionEventListener(*this);
-       AddControl(*pButton);
+       AddControl(pButton);
 
        // Creates an instance of Keypad
        __pKeypad = new Keypad();
index 55a0840..ad48d38 100644 (file)
@@ -100,7 +100,7 @@ LabelSample::OnInitializing(void)
        __pLabel->SetBackgroundColor(Color::GetColor(COLOR_ID_BLUE));
 
        // Adds the label to the form
-       AddControl(*__pLabel);
+       AddControl(__pLabel);
 
        return r;
 }
index 13ecf40..787cb6b 100644 (file)
@@ -143,7 +143,7 @@ ListSample::OnInitializing(void)
        __pList->AddItem(&itemText2, null, null, null, ID_LIST_SECONDITEM);
 
        // Adds the list to the form
-       AddControl(*__pList);
+       AddControl(__pList);
 
        return r;
 }
index 8a7f905..a78be41 100644 (file)
@@ -137,7 +137,7 @@ ListViewSample::OnInitializing(void)
        __pListView->AddListViewItemEventListener(*this);
 
        // Adds the list view to the form
-       AddControl(*__pListView);
+       AddControl(__pListView);
 
        // Creates an instance of ListContextItem
        __pItemContext = new ListContextItem();
index 1599584..e51440f 100644 (file)
@@ -136,7 +136,7 @@ MessageBoxSample::OnInitializing(void)
        pButton->AddActionEventListener(*this);
 
        // Adds the button to the form
-       AddControl(*pButton);
+       AddControl(pButton);
 
        return r;
 }
index e0f8926..0b69a23 100644 (file)
@@ -210,11 +210,11 @@ OverlayRegionSampleForm::OnInitializing(void)
        Label* pLabel = new Label();
        pLabel->Construct(Rectangle(positionX, positionY, 400, 80),L"OverlayRegion Sample");
        pLabel->SetTextColor(Color::GetColor(COLOR_ID_RED));
-       AddControl(*pLabel);
+       AddControl(pLabel);
 
        Button* pButton = new Button();
        pButton->Construct(Rectangle(positionX + widthVideo - 200, positionX + HeightVideo - 100, 180, 80),L"BUTTON");
-       AddControl(*pButton);
+       AddControl(pButton);
 
        return r;
 }
index c4e0543..b7a60ca 100644 (file)
@@ -101,7 +101,7 @@ PanelSample::OnInitializing(void)
        __pPanel->SetBackgroundColor(Color(0x50, 0xFF, 0x38));
 
        //Adds the panel to the form
-       AddControl(*__pPanel);
+       AddControl(__pPanel);
 
        return r;
 }
index 12593dd..9bdf0f7 100644 (file)
@@ -112,7 +112,7 @@ PopupSample::OnInitializing(void)
        pCloseButton->AddActionEventListener(*this);
 
        // Adds the button to the popup
-       __pPopup->AddControl(*pCloseButton);
+       __pPopup->AddControl(pCloseButton);
 
        // Creates an instance of Button to open the popup.
        Button* pOpenButton = new Button();
@@ -121,7 +121,7 @@ PopupSample::OnInitializing(void)
        pOpenButton->AddActionEventListener(*this);
 
        // Adds the button to the form
-       AddControl(*pOpenButton);
+       AddControl(pOpenButton);
 
        return r;
 }
index f50bf31..e718834 100644 (file)
@@ -104,8 +104,8 @@ ProgressSample::OnInitializing(void)
        pButton->AddActionEventListener(*this);
 
        // Adds the __pProgress and the pButton to the form
-       AddControl(*__pProgress);
-       AddControl(*pButton);
+       AddControl(__pProgress);
+       AddControl(pButton);
 
        return r;
 }
index 46846cd..482823a 100644 (file)
@@ -60,6 +60,7 @@ namespace Tizen { namespace Ui { namespace Controls
 class ProgressPopupSample
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IProgressPopupEventListener
+       , public Tizen::Ui::IActionEventListener
 {
 public:
        ProgressPopupSample(void);
@@ -119,9 +120,10 @@ ProgressPopupSample::OnInitializing(void)
 
        // Creates an instance of Button to open the ProgressPopup.
        Button* pButtonProgressPopup = new Button();
-       pButtonProgressPopup->Construct(Rectangle(10, 10, 250, 60), L"Open ProgressPopup");
+       pButtonProgressPopup->Construct(Rectangle(50, 50, 350, 100), L"Open ProgressPopup");
        pButtonProgressPopup->SetActionId(ID_BUTTON_PROGRESSPOPUP);
        pButtonProgressPopup->AddActionEventListener(*this);
+       AddControl(pButtonProgressPopup);
 
        return r;
 }
index ff99609..afb3391 100644 (file)
@@ -108,16 +108,16 @@ RadioGroupSample::OnInitializing(void)
        pCheckButton2->AddActionEventListener(*this);
 
        // Adds check buttons to the form
-       AddControl(*pCheckButton1);
-       AddControl(*pCheckButton2);
+       AddControl(pCheckButton1);
+       AddControl(pCheckButton2);
 
        // Creates an instance of RadioGroup
        __pRadioGroup = new RadioGroup();
        __pRadioGroup->Construct();
 
        // Adds the check buttons to the radio group
-       __pRadioGroup->Add(*pCheckButton1);
-       __pRadioGroup->Add(*pCheckButton2);
+       __pRadioGroup->Add(pCheckButton1);
+       __pRadioGroup->Add(pCheckButton2);
 
        return r;
 }
index 01477d9..c288037 100644 (file)
@@ -102,11 +102,11 @@ ScrollPanelSample::OnInitializing(void)
        pEdit->SetText(L"Edit");
 
        // Adds the button and the edit field to the ScrollPanel
-       __pScrollPanel->AddControl(*pButton);
-       __pScrollPanel->AddControl(*pEdit);
+       __pScrollPanel->AddControl(pButton);
+       __pScrollPanel->AddControl(pEdit);
 
        // Adds the ScrollPanel to the form
-       AddControl(*__pScrollPanel);
+       AddControl(__pScrollPanel);
 
        return r;
 }
index b9bcc15..746bdb2 100644 (file)
@@ -187,7 +187,7 @@ SearchBarSample::OnInitializing(void)
        __pSearchBar->SetContent(__pSearchBarListView);
 
        // Adds controls to the form
-       AddControl(*__pSearchBar);
+       AddControl(__pSearchBar);
 
        return r;
 }
index 6df6d15..0a9eab0 100644 (file)
@@ -62,8 +62,7 @@ class SectionTableViewSample
 {
 public:
        SectionTableViewSample(void)
-       : __pSectionTableView(null)
-       , __pContextItem(null){}
+       : __pSectionTableView(null){}
 
        bool Initialize(void);
        virtual result OnInitializing(void);
@@ -117,13 +116,13 @@ SectionTableViewSample::OnInitializing(void)
        result r = E_SUCCESS;
 
        // Creates an instance of TableView
-       __pSectionTableView = new TableView();
+       __pSectionTableView = new SectionTableView();
        __pSectionTableView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height), true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
-       __pSectionTableView->SetItemProvider(*this);
+       __pSectionTableView->SetItemProvider(this);
        __pSectionTableView->AddSectionTableViewItemEventListener(*this);
 
        // Adds the Section TableView to the form
-       AddControl(*__pSectionTableView);
+       AddControl(__pSectionTableView);
        return r;
 }
 
@@ -162,13 +161,13 @@ SectionTableViewSample::GetItemCount(int sectionIndex)
 bool
 SectionTableViewSample::HasSectionHeader(int sectionIndex)
 {
-       true;
+       return true;
 }
 
 bool
 SectionTableViewSample::HasSectionFooter(int sectionIndex)
 {
-       true;
+       return true;
 }
 
 String
@@ -231,9 +230,9 @@ SectionTableViewSample::CreateItem(int sectionIndex, int itemIndex, int itemWidt
        text.Format(30, L"TableViewItem %d", itemIndex);
 
        Label* pLabel = new Label();
-       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultItemHeight(), text);
+       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultItemHeight()), text);
 
-       pItem->AddControl(*pLabel);
+       pItem->AddControl(pLabel);
 
        return pItem;
 
index 5b3984a..678cf2b 100644 (file)
@@ -165,7 +165,7 @@ SlidableGroupedListSample::OnInitializing(void)
        __pSlidableGroupedList->AddGroup(L"Group3", null, ITEM_COUNT_GROUP3, ITEM_COUNT_GROUP3 * ITEM_HEIGHT);
 
        // Adds the slidable grouped list to the form
-       AddControl(*__pSlidableGroupedList);
+       AddControl(__pSlidableGroupedList);
 
        return r;
 }
index 7b9f0f6..bd362c0 100644 (file)
@@ -158,7 +158,7 @@ SlidableListSample::OnInitializing(void)
        __pCustomListItemFormat->AddElement(ID_LIST_BITMAP, Rectangle(220, 10, 70, 80));
 
        // Adds the slidable list to the form
-       AddControl(*__pSlidableList);
+       AddControl(__pSlidableList);
 
        return r;
 }
index 0c28b02..a8d07a4 100644 (file)
@@ -104,7 +104,7 @@ SliderSample::OnInitializing(void)
        __pSlider->AddAdjustmentEventListener(*this);
 
        // Adds the slider to the form
-       AddControl(*__pSlider);
+       AddControl(__pSlider);
 
        return r;
 }
index bc9bbc9..47e564d 100644 (file)
@@ -63,6 +63,7 @@ public:
        , __pFirstPanel(null)
        , __pSecondPanel(null){}
 
+    bool Initialize(void);
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
 
@@ -113,7 +114,7 @@ SplitPanelSample::OnInitializing(void)
        __pSplitPanel->SetPane(__pSecondPanel, SPLIT_PANEL_PANE_ORDER_SECOND);
 
        // Adds the split panel to the form
-       AddControl(*__pSplitPanel);
+       AddControl(__pSplitPanel);
 
        return E_SUCCESS;
 }
index 0f70048..3994791 100644 (file)
@@ -127,7 +127,7 @@ TabBarSample::OnInitializing()
        __pTabBar->AddActionEventListener(*this);
 
        // Adds the tab bar to the form
-       AddControl(*__pTabBar);
+       AddControl(__pTabBar);
 
        return r;
 }
index 9b103eb..65f96c0 100644 (file)
@@ -115,10 +115,10 @@ TableViewSample::OnInitializing(void)
        __pTableView = new TableView();
        __pTableView->Construct(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height), true, TABLE_VIEW_SCROLL_BAR_STYLE_FADE_OUT);
        __pTableView->SetItemProvider(*this);
-       __pTableView->AddTableViewItemEventListener(*this);
+       __pTableView->AddTableViewItemEventListener(this);
 
        // Adds the TableView to the form
-       AddControl(*__pTableView);
+       AddControl(__pTableView);
 
        // Creates an instance of TableViewContextItem
        __pContextItem = new TableViewContextItem();
@@ -130,8 +130,8 @@ TableViewSample::OnInitializing(void)
        Button* pButton2 = new Button();
        pButton2->Construct(Rectangle(250, 10, 200, 80), L"Context2");
 
-       __pContextItem->AddControl(*pButton);
-       __pContextItem->AddControl(*pButton2);
+       __pContextItem->AddControl(pButton);
+       __pContextItem->AddControl(pButton2);
 
        return r;
 }
@@ -142,8 +142,8 @@ TableViewSample::OnTerminating(void)
        result r = E_SUCCESS;
 
        // Deallocates the item context
-       delete __pItemContext;
-       __pItemContext = null;
+       delete __pContextItem;
+       __pContextItem = null;
 
        return r;
 }
@@ -216,7 +216,7 @@ TableViewSample::CreateItem(int itemIndex, int itemWidth)
        text.Format(30, L"TableViewItem %d", itemIndex);
 
        Label* pLabel = new Label();
-       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultItemHeight(), text);
+       pLabel->Construct(Rectangle(0, 0, itemWidth, GetDefaultItemHeight()), text);
 
        pItem->AddControl(*pLabel);
        pItem->SetContextItem(__pContextItem);
index 99eaaae..48dbb3a 100644 (file)
@@ -165,7 +165,7 @@ TextBoxSample::OnInitializing(void)
        __pTextBox->AppendText(L"\nTizen SDK");
 
        // Adds the text box to the form
-       AddControl(*__pTextBox);
+       AddControl(__pTextBox);
 
        return r;
 }
index 500852c..d16778c 100644 (file)
@@ -63,9 +63,6 @@ class DataBindingSample
        , public Tizen::Ui::IActionEventListener
 {
 public:
-       DataBindingSample(void);
-       virtual ~DataBindingSample(void);
-
        virtual bool Initialize(void);
        virtual result OnInitializing(void);
        virtual void OnActionPerformed(const Tizen::Ui::Control& source, int actionId);
@@ -98,7 +95,6 @@ bool
 DataBindingSample::Initialize(void)
 {
        Construct(FORM_STYLE_NORMAL| FORM_STYLE_INDICATOR| FORM_STYLE_HEADER| FORM_STYLE_FOOTER);
-       SetFooter();
        return true;
 }
 
@@ -116,25 +112,25 @@ DataBindingSample::OnInitializing(void)
        __pUpdateBindingButton = new (std::nothrow) Button();
        __pUpdateBindingButton->Construct(Rectangle(10, rect.height / 6, rect.width - 20, rect.height / 6), L"BindingTarget");
        __pUpdateBindingButton->SetName("Target");
-       AddControl(*__pUpdateBindingButton);
+       AddControl(__pUpdateBindingButton);
 
        __pTargetButton = new (std::nothrow) Button();
        __pTargetButton->Construct(Rectangle(10, (rect.height / 3) + 10 , (rect.width - 20), rect.height / 6), L"Update Binding");
        __pTargetButton->SetActionId(ID_BUTTON_UPDATE_BINDING);
        __pTargetButton->AddActionEventListener(*this);
-       AddControl(*__pTargetButton);
+       AddControl(__pTargetButton);
 
        __pUnbindButton = new (std::nothrow) Button();
        __pUnbindButton->Construct(Rectangle(10, (rect.height * 2 / 3), (rect.width / 2) - 10, rect.height / 6), L"Unbind");
        __pUnbindButton->SetActionId(ID_BUTTON_UNBIND);
        __pUnbindButton->AddActionEventListener(*this);
-       AddControl(*__pUnbindButton);
+       AddControl(__pUnbindButton);
 
        __pBindButton = new (std::nothrow) Button();
        __pBindButton->Construct(Rectangle((rect.width / 2) + 10 , (rect.height * 2 / 3), (rect.width / 2) - 20 , rect.height / 6), L"Bind");
        __pBindButton->SetActionId(ID_BUTTON_BIND);
        __pBindButton->AddActionEventListener(*this);
-       AddControl(*__pBindButton);
+       AddControl(__pBindButton);
 
        DataBindingContext* pContext = GetDataBindingContextN();
        r = pContext->Bind(L"bindingcount", L"Target", L"text", __bindIntegerToButtonText, DATA_BINDING_DATA_TYPE_INTEGER, DATA_BINDING_FLOW_ONE_WAY, DATA_BINDING_TRIGGER_EXPLICIT, null, null, null);
index 712cbb6..bbeb97f 100644 (file)
@@ -88,26 +88,26 @@ GridLayoutSample::OnInitializing(void)
                Label* pLabel1 = new Label();
                pLabel1->Construct(Rectangle(0, 0, 100, 200), L"Label1\n(0, 0)");
                pLabel1->SetBackgroundColor(Color(0x00, 0x10, 0x80, 0xFF));
-               pPanel->AddControl(*pLabel1);
+               pPanel->AddControl(pLabel1);
 
                Label* pLabel2 = new Label();
                pLabel2->Construct(Rectangle(0, 0, 100, 200), L"Label2\n(0, 1)");
                pLabel2->SetBackgroundColor(Color(0x00, 0x20, 0xA0, 0xFF));
-               pPanel->AddControl(*pLabel2);
+               pPanel->AddControl(pLabel2);
 
                Label* pLabel3 = new Label();
                pLabel3->Construct(Rectangle(0, 0, 100, 200), L"Label3\n(0, 2)");
                pLabel3->SetBackgroundColor(Color(0x00, 0x30, 0xC0, 0xFF));
-               pPanel->AddControl(*pLabel3);
+               pPanel->AddControl(pLabel3);
 
                Label* pLabel4 = new Label();
                pLabel4->Construct(Rectangle(0, 0, 100, 200), L"Label4\n(1, 0)");
                pLabel4->SetBackgroundColor(Color(0x00, 0x40, 0xE0, 0xFF));
-               pPanel->AddControl(*pLabel4);
+               pPanel->AddControl(pLabel4);
 
                Button* pButton = new Button();
                pButton->Construct(Rectangle(0, 0, 100, 200), L"Button\n(1, 1)");
-               pPanel->AddControl(*pButton);
+               pPanel->AddControl(pButton);
 
                // Sets position to each label and button in grid layout
                gridPanelLayout.SetPosition(*pLabel1, 0, 0, 1, 1);
@@ -128,7 +128,7 @@ GridLayoutSample::OnInitializing(void)
        }
 
        // Adds the top panel to the form
-       AddControl(*pPanel);
+       AddControl(pPanel);
 
        return r;
 }
index 2efcfde..793480b 100644 (file)
@@ -94,24 +94,24 @@ HorizontalBoxLayoutSample::OnInitializing(void)
                pLabel1->Construct(Rectangle(0,0,GetClientAreaBounds().width/4,100), L"TOP");
                pLabel1->SetTextConfig(20, LABEL_TEXT_STYLE_NORMAL);
                pLabel1->SetBackgroundColor(Color(0x00, 0x10, 0x80, 0xFF));
-               pTopPanel->AddControl(*pLabel1);
+               pTopPanel->AddControl(pLabel1);
 
                Label* pLabel2 = new Label();
                pLabel2->Construct(Rectangle(0,0,GetClientAreaBounds().width/4,100), L"MIDDLE");
                pLabel2->SetTextConfig(20, LABEL_TEXT_STYLE_NORMAL);
                pLabel2->SetBackgroundColor(Color(0x00, 0x20, 0xA0, 0xFF));
-               pTopPanel->AddControl(*pLabel2);
+               pTopPanel->AddControl(pLabel2);
 
                Label* pLabel3 = new Label();
                pLabel3->Construct(Rectangle(0,0,GetClientAreaBounds().width/4,100), L"BOTTOM");
                pLabel3->SetTextConfig(20, LABEL_TEXT_STYLE_NORMAL);
                pLabel3->SetBackgroundColor(Color(0x00, 0x30, 0xC0, 0xFF));
-               pTopPanel->AddControl(*pLabel3);
+               pTopPanel->AddControl(pLabel3);
 
                Button* pButton = new Button();
                pButton->Construct(Rectangle(0,0,GetClientAreaBounds().width/4 - 10,100), L"FIT\nTO\nPARENT");
                pButton->SetTextSize(20);
-               pTopPanel->AddControl(*pButton);
+               pTopPanel->AddControl(pButton);
 
                // Sets relations each label and button
                topPanelLayout.SetVerticalAlignment(*pLabel1, LAYOUT_VERTICAL_ALIGN_TOP);
@@ -121,7 +121,7 @@ HorizontalBoxLayoutSample::OnInitializing(void)
                topPanelLayout.SetVerticalFitPolicy(*pButton, FIT_POLICY_PARENT);
        }
        // Adds the top panel to the form
-       AddControl(*pTopPanel);
+       AddControl(pTopPanel);
 
        // Creates an instance of HorizontalBoxLayout for bottom panel
        HorizontalBoxLayout bottomPanelLayout;
@@ -135,17 +135,17 @@ HorizontalBoxLayoutSample::OnInitializing(void)
                Label* pLabel1 = new Label();
                pLabel1->Construct(Rectangle(0,0,30,100), L"W\n1.0f");
                pLabel1->SetBackgroundColor(Color(0x00, 0x10, 0x80, 0xFF));
-               pBottomPanel->AddControl(*pLabel1);
+               pBottomPanel->AddControl(pLabel1);
 
                Label* pLabel2 = new Label();
                pLabel2->Construct(Rectangle(0,0,30,100), L"W\n2.0f");
                pLabel2->SetBackgroundColor(Color(0x00, 0x20, 0xA0, 0xFF));
-               pBottomPanel->AddControl(*pLabel2);
+               pBottomPanel->AddControl(pLabel2);
 
                Label* pLabel3 = new Label();
                pLabel3->Construct(Rectangle(0,0,30,100), L"W\n3.0f");
                pLabel3->SetBackgroundColor(Color(0x00, 0x30, 0xC0, 0xFF));
-               pBottomPanel->AddControl(*pLabel3);
+               pBottomPanel->AddControl(pLabel3);
 
                // Sets relations each label
                bottomPanelLayout.SetVerticalFitPolicy(*pLabel1, FIT_POLICY_PARENT);
@@ -157,7 +157,7 @@ HorizontalBoxLayoutSample::OnInitializing(void)
        }
 
        // Adds the bottom panel to the form
-       AddControl(*pBottomPanel);
+       AddControl(pBottomPanel);
 
        //Gets the layout of the form
        VerticalBoxLayout* pFormLayout = dynamic_cast<VerticalBoxLayout*>(this->GetLayoutN());
index 266b2e2..800b116 100644 (file)
@@ -98,19 +98,19 @@ RelativeLayoutSample::OnInitializing(void)
                // Creates instances of Button
                Button* pUpButton = new Button();
                pUpButton->Construct(Rectangle(0,0,200,100), "UP");
-               pTopRelativePanel->AddControl(*pUpButton);
+               pTopRelativePanel->AddControl(pUpButton);
 
                Button* pMiddleButton = new Button();
                pMiddleButton->Construct(Rectangle(0,0,200,100), "CENTER");
-               pTopRelativePanel->AddControl(*pMiddleButton);
+               pTopRelativePanel->AddControl(pMiddleButton);
 
                Button* pDownButton = new Button();
                pDownButton->Construct(Rectangle(0,0,200,100), "DOWN");
-               pTopRelativePanel->AddControl(*pDownButton);
+               pTopRelativePanel->AddControl(pDownButton);
 
                // Sets relations between the pUpButton and pMiddleButton
-               topPanelLayout.SetRelation(*pUpButton, *pMiddleButton, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-               topPanelLayout.SetRelation(*pUpButton, *pMiddleButton, RECT_EDGE_RELATION_BOTTOM_TO_TOP);
+               topPanelLayout.SetRelation(*pUpButton, pMiddleButton, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               topPanelLayout.SetRelation(*pUpButton, pMiddleButton, RECT_EDGE_RELATION_BOTTOM_TO_TOP);
                topPanelLayout.SetMargin(*pUpButton, 0, 0, 0, 10);
 
                // Sets the middle button
@@ -119,13 +119,13 @@ RelativeLayoutSample::OnInitializing(void)
                topPanelLayout.SetMargin(*pMiddleButton, 10, 10, 10, 10);
 
                // Sets relations between the pDownButton and the pMiddleButton
-               topPanelLayout.SetRelation(*pDownButton, *pMiddleButton, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
-               topPanelLayout.SetRelation(*pDownButton, *pMiddleButton, RECT_EDGE_RELATION_TOP_TO_BOTTOM);
+               topPanelLayout.SetRelation(*pDownButton, pMiddleButton, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               topPanelLayout.SetRelation(*pDownButton, pMiddleButton, RECT_EDGE_RELATION_TOP_TO_BOTTOM);
                topPanelLayout.SetMargin(*pDownButton, 0, 0, 10, 0);
        }
 
        // Adds the top panel to the form
-       AddControl(*pTopRelativePanel);
+       AddControl(pTopRelativePanel);
 
        // Creates an instance of RelativeLayout for the bottom panel
        RelativeLayout bottomPanelLayout;
@@ -140,50 +140,50 @@ RelativeLayoutSample::OnInitializing(void)
                pFixedLabel->Construct(Rectangle(0, 0, 150, 80), L"FIXED");
                pFixedLabel->SetBackgroundColor(Color::GetColor(COLOR_ID_YELLOW));
                pFixedLabel->SetTextColor(Color::GetColor(COLOR_ID_BLACK));
-               pBottomRelativePanel->AddControl(*pFixedLabel);
+               pBottomRelativePanel->AddControl(pFixedLabel);
 
                Label* pScalableLabel = new Label();
                pScalableLabel->Construct(Rectangle(0, 0, 150, 80), L"SCALABLE <=>");
                pScalableLabel->SetBackgroundColor(Color::GetColor(COLOR_ID_BLUE));
                pScalableLabel->SetTextColor(Color::GetColor(COLOR_ID_BLACK));
-               pBottomRelativePanel->AddControl(*pScalableLabel);
+               pBottomRelativePanel->AddControl(pScalableLabel);
 
                // Sets relations between the fixed label and the panel
                bottomPanelLayout.SetCenterAligned(*pFixedLabel, CENTER_ALIGN_VERTICAL);
-               bottomPanelLayout.SetRelation(*pFixedLabel, *pBottomRelativePanel, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-               bottomPanelLayout.SetRelation(*pFixedLabel, *pBottomRelativePanel, RECT_EDGE_RELATION_TOP_TO_TOP);
+               bottomPanelLayout.SetRelation(*pFixedLabel, pBottomRelativePanel, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+               bottomPanelLayout.SetRelation(*pFixedLabel, pBottomRelativePanel, RECT_EDGE_RELATION_TOP_TO_TOP);
                bottomPanelLayout.SetMargin(*pFixedLabel, 30, 30, 30, 30);
 
                // Sets relations between the scalable label and the panel
                bottomPanelLayout.SetCenterAligned(*pScalableLabel, CENTER_ALIGN_VERTICAL);
-               bottomPanelLayout.SetRelation(*pScalableLabel, *pFixedLabel, RECT_EDGE_RELATION_LEFT_TO_RIGHT);
-               bottomPanelLayout.SetRelation(*pScalableLabel, *pFixedLabel, RECT_EDGE_RELATION_LEFT_TO_RIGHT);
-               bottomPanelLayout.SetRelation(*pScalableLabel, *pBottomRelativePanel, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
-               bottomPanelLayout.SetRelation(*pScalableLabel, *pBottomRelativePanel, RECT_EDGE_RELATION_TOP_TO_TOP);
+               bottomPanelLayout.SetRelation(*pScalableLabel, pFixedLabel, RECT_EDGE_RELATION_LEFT_TO_RIGHT);
+               bottomPanelLayout.SetRelation(*pScalableLabel, pFixedLabel, RECT_EDGE_RELATION_LEFT_TO_RIGHT);
+               bottomPanelLayout.SetRelation(*pScalableLabel, pBottomRelativePanel, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+               bottomPanelLayout.SetRelation(*pScalableLabel, pBottomRelativePanel, RECT_EDGE_RELATION_TOP_TO_TOP);
                bottomPanelLayout.SetMargin(*pScalableLabel, 30, 30, 30, 30);
        }
 
        // Adds the bottom panel to the form
-       AddControl(*pBottomRelativePanel);
+       AddControl(pBottomRelativePanel);
 
        //Gets the layout of the form
        RelativeLayout* pFormLayout = dynamic_cast<RelativeLayout*>(this->GetLayoutN());
 
        // Sets relations of the top relative panel
-       pFormLayout->SetRelation(*pTopRelativePanel, *this, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-       pFormLayout->SetRelation(*pTopRelativePanel, *this, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
-       pFormLayout->SetRelation(*pTopRelativePanel, *this, RECT_EDGE_RELATION_TOP_TO_TOP);
+       pFormLayout->SetRelation(*pTopRelativePanel, this, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       pFormLayout->SetRelation(*pTopRelativePanel, this, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+       pFormLayout->SetRelation(*pTopRelativePanel, this, RECT_EDGE_RELATION_TOP_TO_TOP);
 
        // Sets relations of the bottom relative panel
-       pFormLayout->SetRelation(*pBottomRelativePanel, *this, RECT_EDGE_RELATION_LEFT_TO_LEFT);
-       pFormLayout->SetRelation(*pBottomRelativePanel, *this, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
-       pFormLayout->SetRelation(*pBottomRelativePanel, *this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM);
+       pFormLayout->SetRelation(*pBottomRelativePanel, this, RECT_EDGE_RELATION_LEFT_TO_LEFT);
+       pFormLayout->SetRelation(*pBottomRelativePanel, this, RECT_EDGE_RELATION_RIGHT_TO_RIGHT);
+       pFormLayout->SetRelation(*pBottomRelativePanel, this, RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM);
 
        // Sets relations between the top relative panel and the bottom relative panel
        pFormLayout->SetHorizontalFitPolicy(*pTopRelativePanel, FIT_POLICY_PARENT);
        pFormLayout->SetHorizontalFitPolicy(*pBottomRelativePanel, FIT_POLICY_PARENT);
        pFormLayout->SetVerticalFitPolicy(*pBottomRelativePanel, FIT_POLICY_FIXED);
-       pFormLayout->SetRelation(*pTopRelativePanel, *pBottomRelativePanel, RECT_EDGE_RELATION_BOTTOM_TO_TOP);
+       pFormLayout->SetRelation(*pTopRelativePanel, pBottomRelativePanel, RECT_EDGE_RELATION_BOTTOM_TO_TOP);
 
        return r;
 }
@@ -252,7 +252,7 @@ public:
        /**
         * Sets the relation of a specified child control for the edge with other control.
         *
-        * @since               2.0
+        * @since               2.1
         *
         * @return              An error code
         * @param[in]   childControl    The control for which the relation is set
index 3518564..24e76d1 100644 (file)
@@ -93,21 +93,21 @@ VerticalBoxLayoutSample::OnInitializing(void)
                Label* pLabel1 = new Label();
                pLabel1->Construct(Rectangle(0,0,150,80), L"RIGHT");
                pLabel1->SetBackgroundColor(Color(0x00, 0x10, 0x80, 0xFF));
-               pTopPanel->AddControl(*pLabel1);
+               pTopPanel->AddControl(pLabel1);
 
                Label* pLabel2 = new Label();
                pLabel2->Construct(Rectangle(0,0,200,80), L"CENTER");
                pLabel2->SetBackgroundColor(Color(0x00, 0x20, 0xA0, 0xFF));
-               pTopPanel->AddControl(*pLabel2);
+               pTopPanel->AddControl(pLabel2);
 
                Label* pLabel3 = new Label();
                pLabel3->Construct(Rectangle(0,0,150,80), L"LEFT");
                pLabel3->SetBackgroundColor(Color(0x00, 0x30, 0xC0, 0xFF));
-               pTopPanel->AddControl(*pLabel3);
+               pTopPanel->AddControl(pLabel3);
 
                Button* pButton = new Button();
                pButton->Construct(Rectangle(0,0,150,80), "FIT TO PARENT");
-               pTopPanel->AddControl(*pButton);
+               pTopPanel->AddControl(pButton);
 
                // Sets relations each label and button
                topPanelLayout.SetHorizontalAlignment(*pLabel1, LAYOUT_HORIZONTAL_ALIGN_RIGHT);
@@ -118,7 +118,7 @@ VerticalBoxLayoutSample::OnInitializing(void)
        }
 
        // Adds the top panel to the form
-       AddControl(*pTopPanel);
+       AddControl(pTopPanel);
 
        // Creates an instance of VerticalBoxLayout for the bottom panel
        VerticalBoxLayout bottomPanelLayout;
@@ -132,17 +132,17 @@ VerticalBoxLayoutSample::OnInitializing(void)
                Label* pLabel1 = new Label();
                pLabel1->Construct(Rectangle(0,0,100,50), L"WEIGHT = 1.0f");
                pLabel1->SetBackgroundColor(Color(0x00, 0x10, 0x80, 0xFF));
-               pBottomPanel->AddControl(*pLabel1);
+               pBottomPanel->AddControl(pLabel1);
 
                Label* pLabel2 = new Label();
                pLabel2->Construct(Rectangle(0,0,100,50), L"WEIGHT = 2.0f");
                pLabel2->SetBackgroundColor(Color(0x00, 0x20, 0xA0, 0xFF));
-               pBottomPanel->AddControl(*pLabel2);
+               pBottomPanel->AddControl(pLabel2);
 
                Label* pLabel3 = new Label();
                pLabel3->Construct(Rectangle(0,0,100,50), L"WEIGHT = 3.0f");
                pLabel3->SetBackgroundColor(Color(0x00, 0x30, 0xC0, 0xFF));
-               pBottomPanel->AddControl(*pLabel3);
+               pBottomPanel->AddControl(pLabel3);
 
                // Sets relations each label
                bottomPanelLayout.SetHorizontalFitPolicy(*pLabel1, FIT_POLICY_PARENT);
@@ -154,7 +154,7 @@ VerticalBoxLayoutSample::OnInitializing(void)
        }
 
        // Adds the bottom panel to the form
-       AddControl(*pBottomPanel);
+       AddControl(pBottomPanel);
 
        //Gets the layout of the form
        VerticalBoxLayout* pFormLayout = dynamic_cast<VerticalBoxLayout*>(this->GetLayoutN());
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg.#.png
new file mode 100644 (file)
index 0000000..1b07445
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_bottom.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_bottom.#.png
new file mode 100644 (file)
index 0000000..7e6f6a1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_bottom.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_center.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_center.#.png
new file mode 100644 (file)
index 0000000..02ee1d1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_center.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_top.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_top.#.png
new file mode 100644 (file)
index 0000000..0c93117
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_edit_group_bg_top.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg.#.png
new file mode 100644 (file)
index 0000000..97ae24d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg_ef.#.png
new file mode 100644 (file)
index 0000000..79d90fa
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_quick_menu_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..c2d4df9
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..3bf6436
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_ef.#.png
new file mode 100644 (file)
index 0000000..3661d2c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..c46f3fc
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_edit_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..9851e6d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..21f8d83
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_ef.#.png
new file mode 100644 (file)
index 0000000..8357a30
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..6e0b01f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_edit_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..9851e6d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..21f8d83
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_ef.#.png
new file mode 100644 (file)
index 0000000..8357a30
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..6e0b01f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_edit_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg.#.png
new file mode 100644 (file)
index 0000000..38eaec5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_bottom.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_bottom.#.png
new file mode 100644 (file)
index 0000000..17bdb80
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_bottom.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_center.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_center.#.png
new file mode 100644 (file)
index 0000000..6d84934
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_center.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_top.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_top.#.png
new file mode 100644 (file)
index 0000000..39741d1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_edit_group_bg_top.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg.#.png
new file mode 100644 (file)
index 0000000..7781aa0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg_ef.#.png
new file mode 100644 (file)
index 0000000..76c808a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_quick_menu_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..7ff73eb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..bbfd0b2
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_ef.#.png
new file mode 100644 (file)
index 0000000..ac7ecf4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..813d2b1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_edit_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..21c8016
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..8318951
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_ef.#.png
new file mode 100644 (file)
index 0000000..6929e03
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..8d15a94
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_edit_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..21c8016
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..8318951
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_ef.#.png
new file mode 100644 (file)
index 0000000..6929e03
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..8d15a94
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_edit_group_bg_top_ef.#.png differ
index 4beea90..19646e3 100644 (file)
@@ -193,13 +193,12 @@ _AppResourceBitmapUtil::Construct(const String& resourceFolder)
 
        for (int currentDensity = DENSITY_XHIGH; currentDensity >= DENSITY_LOW; currentDensity--)
        {
-               SysAssert(densityIndex > 0 && densityIndex < DENSITY_MAX);
-
                if (static_cast<int>(__sortedDensity[0]) == currentDensity)
                {
                        continue;
                }
 
+               SysAssert(densityIndex > 0 && densityIndex < DENSITY_MAX);
                __sortedDensity[densityIndex] = static_cast<_Density>(currentDensity);
 
                if (GetDirectoryPath(resourceFolder, __sortedDensity[densityIndex], __sortedDensityDirectories[densityIndex]) == false)
index 2aa7d34..e9cd041 100644 (file)
@@ -30,7 +30,6 @@
 #include <FUiCtrlFrame.h>
 
 #include <FBaseRt_Process.h>
-#include <FSys_PowerManagerImpl.h>
 #include <FUi_ControlImplManager.h>
 #include <FUi_KeyEventManager.h>
 #include <FUi_WindowImpl.h>
@@ -39,7 +38,7 @@
 #include <FUi_UiNotificationEvent.h>
 #include <FUi_UiEventManager.h>
 #include <FUiCtrl_FrameImpl.h>
-#include <FUi_ControlManager.h>
+#include <FSys_PowerManagerImpl.h>
 
 #include "FApp_AppFrame.h"
 #include "FApp_AppInfo.h"
@@ -261,14 +260,8 @@ _UiAppImpl::OnDeviceOrientationChanged(app_device_orientation_e orientation)
 long
 _UiAppImpl::OnWindowHandleRequest(void)
 {
-       _Window* pWin = _ControlManager::GetInstance()->GetTopVisibleWindow();
-       if (pWin)
-       {
-               unsigned int han = pWin->GetNativeHandle();
-               return han;
-       }
-
-       return -1;
+       const _EcoreEvas* const pEvas = GetEcoreEvasMgr()->GetEcoreEvas();
+       return (pEvas) ? static_cast<long>(pEvas->GetXWindow()) : -1;
 }
 
 
index abd7436..42f10e0 100644 (file)
@@ -200,6 +200,11 @@ _EnrichedTextImpl::RemoveAt(int elementIndex, bool deallocate)
                        , E_INVALID_ARG, E_INVALID_ARG
                        , "[E_INVALID_ARG] The argument is invalid.");
 
+       if (__pTextObject.use_count() > 1)
+       {
+               return E_SUCCESS;
+       }
+
        result r = E_SUCCESS;
        int count = GetTextElementCount();
        TextElement* pTextElement = null;
@@ -244,6 +249,11 @@ _EnrichedTextImpl::Remove(Tizen::Graphics::TextElement& element, bool deallocate
        SysTryReturn(NID_GRP, __pTextObject != null, E_OPERATION_FAILED, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
 
+       if (__pTextObject.use_count() > 1)
+       {
+               return E_SUCCESS;
+       }
+
        int textElementIndex = 0;
        result r = E_SUCCESS;
        TextElement* pTextElement = null;
@@ -1578,8 +1588,6 @@ _EnrichedTextImpl::_EnrichedTextImpl(const _EnrichedTextImpl& rhs)
        SysTryReturnVoidResult(NID_GRP, rhs.__pTextObject, E_OPERATION_FAILED, "[E_OPERATION_FAILED] This instance is not initialized.");
 
        result r = E_SUCCESS;
-       TextElement* pTextElement = null;
-
        FloatDimension size = rhs.GetSizeF();
 
        __width = size.width;
@@ -1602,57 +1610,21 @@ _EnrichedTextImpl::_EnrichedTextImpl(const _EnrichedTextImpl& rhs)
        }
 
        __pTextElement = new (std::nothrow) TextElement();
-       SysTryCatch(NID_GRP, __pTextElement, , r, "[E_OUT_OF_MEMORY] Fail to create element.");
-
-       r = __pTextElement->Construct();
-       SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Fail to construct text element.", GetErrorMessage(r));
-
-       for (int i = 0; i < __pLinkedListTextElementList->GetCount(); i++)
+       if (__pTextElement == null)
        {
-               pTextElement = dynamic_cast < TextElement* >(__pLinkedListTextElementList->GetAt(i));
-               if (pTextElement == null) //Bitmap
-               {
-                       Bitmap* pBitmap = dynamic_cast < Bitmap* >(pTextElement);
-                       SysTryCatch(NID_GRP, pBitmap, , r, "[%s] Fails to get a bitmap.", GetErrorMessage(r));
-
-                       Bitmap* pNewBitmap = new (std::nothrow) Bitmap();
-                       SysTryCatch(NID_GRP, pNewBitmap, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Fail to create a bitmap.");
-
-                       r = pNewBitmap->Construct(*pBitmap, FloatRectangle(0, 0, pBitmap->GetWidthF(), pBitmap->GetHeightF()));
-                       SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Fails to insert image.", GetErrorMessage(r));
-
-                       r = __pLinkedListTextElementList->InsertAt(*pNewBitmap, i);
-                       SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Fails to insert image.", GetErrorMessage(r));
-               }
-               else
-               {
-                       TextElement* pNewTextElement = _TextElementImpl::CreateTextElementN(*pTextElement);
-                       SysTryCatch(NID_GRP, pNewTextElement, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Fail to create a TextElement.");
-
-                       _TextElementImpl* pTextElementImpl = _TextElementImpl::GetInstance(*pNewTextElement);
-                       SysTryCatch(NID_GRP, pTextElementImpl, r = E_OUT_OF_MEMORY, r, "[E_OUT_OF_MEMORY] Fail to create a TextElementImpl.");
-
-                       pTextElementImpl->SetRegisteringEnrichedText(this);
+               delete __pLinkedListTextElementList;
 
-                       r = __pLinkedListTextElementList->InsertAt(*pNewTextElement, i);
-                       SysTryCatch(NID_GRP, r == E_SUCCESS, , r, "[%s] Fails to insert TextElement.", GetErrorMessage(r));
-               }
+               SetLastResult(E_OUT_OF_MEMORY);
+               SysLog(NID_GRP, "[E_OUT_OF_MEMORY] Fail to create element.");
        }
 
-       return;
-
-CATCH:
-       if (__pLinkedListTextElementList)
+       r = __pTextElement->Construct();
+       if (r != E_SUCCESS)
        {
-               __pLinkedListTextElementList->RemoveAll(true);
                delete __pLinkedListTextElementList;
-               __pLinkedListTextElementList = null;
-       }
-
-       if (__pTextElement)
-       {
                delete __pTextElement;
-               __pTextElement = null;
+
+               SysLog(NID_GRP, "[%s] Fail to construct text element.", GetErrorMessage(r));
        }
 }
 
index e7b89b3..2c0124c 100644 (file)
@@ -63,7 +63,6 @@ _TextElementImpl::_TextElementImpl(void)
        __count = 0;
        __linkOffset = 0;
        __pTextComponent = null;
-       __refCount = 1;
 }
 
 _TextElementImpl::~_TextElementImpl(void)
@@ -1090,43 +1089,6 @@ _TextElementImpl::IsOutlineColorEnable(void) const
        return __outlineColorEnable;
 }
 
-void
-_TextElementImpl::AddRef(void)
-{
-       __refCount++;
-}
-
-void
-_TextElementImpl::Release(void)
-{
-       if (__refCount >= 1)
-       {
-               __refCount--;
-               if (__refCount == 0)
-               {
-                       delete this;
-               }
-       }
-}
-
-TextElement*
-_TextElementImpl::CreateTextElementN(TextElement& textElement)
-{
-       TextElement* pTextElement = new (std::nothrow) TextElement;
-       SysTryReturn(NID_GRP, pTextElement, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
-
-       pTextElement->__pImpl = textElement.__pImpl;
-       pTextElement->__pImpl->AddRef();
-
-       return pTextElement;
-}
-
-int
-_TextElementImpl::GetReferenceCount(void) const
-{
-       return __refCount;
-}
-
 _TextElementImpl*
 _TextElementImpl::GetInstance(TextElement& element)
 {
index 2f5137a..3501512 100644 (file)
@@ -212,6 +212,7 @@ static const unsigned short TEXT_PARAGRAPH_SEPARATOR = 0x2029;
 static const unsigned short TEXT_TAB_CHARACTER = 0x09;
 static const unsigned short TEXT_JAPANESE_DOT = 0x3001;
 static const unsigned short TEXT_JAPANESE_COMMA = 0x3002;
+static const unsigned short TEXT_JAPANESE_SPACE = 0x3000;
 
 }}} // Tizen::Graphics::_Text
 
index 0ad1230..f3f8ddb 100644 (file)
@@ -100,11 +100,6 @@ public:
        bool IsOutlineColorEnable(void) const;
        bool IsConstructed(void) const;
 
-       static TextElement* CreateTextElementN(TextElement& textElement);
-       void AddRef(void);
-       void Release(void);
-       int GetReferenceCount(void) const;
-
        static _TextElementImpl* GetInstance(TextElement& element);
        static const _TextElementImpl* GetInstance(const TextElement& element);
 
@@ -129,8 +124,6 @@ private:
        int __linkOffset;
        Tizen::Graphics::_Text::TextElement* __pTextComponent;
 
-       int __refCount;
-
 private:
        _TextElementImpl(const _TextElementImpl& textElementImpl);
        _TextElementImpl& operator =(const _TextElementImpl& rhs);
index 652da3d..85b9aba 100644 (file)
@@ -803,15 +803,6 @@ _PostRenderCallback(Ecore_Evas* ee)
                                , (unsigned int)surface
                                , (unsigned int)context
                                , (unsigned int)eglGetError());
-
-               if (__pPreviousSglInfo->glVersion == 1)
-               {
-                       _GlClear_1(GL_COLOR_BUFFER_BIT);
-               }
-               else
-               {
-                       _GlClear_2(GL_COLOR_BUFFER_BIT);
-               }
        }
 }
 
index d83bbeb..d872047 100644 (file)
@@ -600,7 +600,7 @@ TextComposite::Draw(_CanvasImpl& canvasImpl, FloatRectangle& displayRect, int st
                        SysTryReturn(NID_GRP, length >= 0 && length < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",length, pSimpleText->GetTextLength());
 
-                       if (pText[length] == (wchar_t)L' ')
+                       if (pText[length] == (wchar_t)L' ' || pText[length] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(length + elementTextOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -623,7 +623,7 @@ TextComposite::Draw(_CanvasImpl& canvasImpl, FloatRectangle& displayRect, int st
                        SysTryReturn(NID_GRP, index >= 0 && index < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",index, pSimpleText->GetTextLength());
 
-                       if (pText[index] == (wchar_t)L' ')
+                       if (pText[index] == (wchar_t)L' ' || pText[index] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(textIndexFromElementOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -834,7 +834,7 @@ TextComposite::DrawWithEliipsis(_CanvasImpl& canvasImpl, FloatRectangle& display
                        SysTryReturn(NID_GRP, length >= 0 && length < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",length, pSimpleText->GetTextLength());
 
-                       if (pText[length] == (wchar_t)L' ')
+                       if (pText[length] == (wchar_t)L' ' || pText[length] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(length + elementTextOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -857,7 +857,7 @@ TextComposite::DrawWithEliipsis(_CanvasImpl& canvasImpl, FloatRectangle& display
                        SysTryReturn(NID_GRP, index >= 0 && index < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",index, pSimpleText->GetTextLength());
 
-                       if (pText[index] == (wchar_t)L' ')
+                       if (pText[index] == (wchar_t)L' ' || pText[index] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(textIndexFromElementOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -1173,7 +1173,7 @@ TextComposite::DrawWithBaseline(_CanvasImpl& canvasImpl, FloatRectangle& display
                        SysTryReturn(NID_GRP, length >= 0 && length < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",length, pSimpleText->GetTextLength());
 
-                       if (pText[length] == (wchar_t)L' ')
+                       if (pText[length] == (wchar_t)L' ' || pText[length] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(length + elementTextOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -1196,7 +1196,7 @@ TextComposite::DrawWithBaseline(_CanvasImpl& canvasImpl, FloatRectangle& display
                        SysTryReturn(NID_GRP, index >= 0 && index < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",index, pSimpleText->GetTextLength());
 
-                       if (pText[index] == (wchar_t)L' ')
+                       if (pText[index] == (wchar_t)L' ' || pText[index] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(textIndexFromElementOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -1390,7 +1390,7 @@ TextComposite::DrawWithBaselineWithEllipsis(_CanvasImpl& canvasImpl, FloatRectan
                        SysTryReturn(NID_GRP, length >= 0 && length < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",length, pSimpleText->GetTextLength());
 
-                       if (pText[length] == (wchar_t)L' ')
+                       if (pText[length] == (wchar_t)L' ' || pText[length] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(length + elementTextOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -1413,7 +1413,7 @@ TextComposite::DrawWithBaselineWithEllipsis(_CanvasImpl& canvasImpl, FloatRectan
                        SysTryReturn(NID_GRP, index >= 0 && index < pSimpleText->GetTextLength()
                                , E_OUT_OF_RANGE, E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",index, pSimpleText->GetTextLength());
 
-                       if (pText[index] == (wchar_t)L' ')
+                       if (pText[index] == (wchar_t)L' ' || pText[index] == TEXT_JAPANESE_SPACE)
                        {
                                GetRegion(textIndexFromElementOffset, 1, spaceCharDim.width, spaceCharDim.height);
                                textLength--;
@@ -5758,7 +5758,7 @@ TextComposite::GetDisplayableText(FloatRectangle displayRect, TextObjectActionTy
                                        , String(L""), E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)"
                                        ,index, pSimpleText->GetTextLength());
 
-                               if (pText[index] == (wchar_t)L' ')
+                               if (pText[index] == (wchar_t)L' ' || pText[index] == TEXT_JAPANESE_SPACE)
                                {
                                        remainingLength--;
                                        lineOffset++;
index 01ea1f9..3c3792a 100644 (file)
@@ -23,6 +23,7 @@
 #include <new>
 #include <FBaseCharacter.h>
 #include <FBaseSysLog.h>
+#include "FGrp_TextCommon.h"
 #include "FGrp_TextTextCutLinkParser.h"
 
 using namespace Tizen::Base;
@@ -241,9 +242,9 @@ GetUrlLink(const String& text, int index, int lastLinkEndIndex, int domainLength
                        index++;
                }
        }
-       else if (text[index] != null && text[index] != L' ' && text[index] != L')' &&
-                        text[index] != L']' && text[index] != 0xFFFC &&
-                        text[index] != 0x000A && text[index] != 0x000D)
+       else if (text[index] != null && text[index] != L' ' && text[index] != TEXT_JAPANESE_SPACE &&
+                       text[index] != L')' && text[index] != L']' && text[index] != 0xFFFC &&
+                       text[index] != 0x000A && text[index] != 0x000D)
        {
                return false;
        }
@@ -418,7 +419,7 @@ IsPhoneNumber(const String& text, int index, int& linkLength)
                {
                        oneDot = true;
                }
-               else if (text[index + j] == L' ' || text[index + j] == L'(' || text[index + j] == L')')
+               else if (text[index + j] == L' ' || text[index + j] == TEXT_JAPANESE_SPACE || text[index + j] == L'(' || text[index + j] == L')')
                {
                        // empty statement
                }
@@ -438,17 +439,17 @@ IsPhoneNumber(const String& text, int index, int& linkLength)
                while (index < totalLength &&
                           (Character::IsDigit(text[index]) || (text[index] == L'*') ||
                                (text[index] == L'#') || (text[index] == L'-') ||
-                               (text[index] == L' ') || (text[index] == L'+') ||
+                               (text[index] == L' ') || (text[index] == TEXT_JAPANESE_SPACE) || (text[index] == L'+') ||
                                (text[index] == L'.') || (text[index] == L'(') ||
                                (text[index] == L')') || (index == linkOffset && (text[linkOffset] == L'+'))))
                {
                        index++;
 
-                       if (blankCount == 0 && text[index] == L' ')
+                       if (blankCount == 0 && (text[index] == L' ' || text[index] == TEXT_JAPANESE_SPACE))
                        {
                                blankCount++;
                        }
-                       else if (blankCount == 1 && text[index] == L' ')
+                       else if (blankCount == 1 && (text[index] == L' ' || text[index] == TEXT_JAPANESE_SPACE))
                        {
                                blankCount++;
                                break;
@@ -476,10 +477,10 @@ IsPhoneNumber(const String& text, int index, int& linkLength)
                        }
                }
 
-               if (text[index - 1] == L' ')
+               if (text[index - 1] == L' ' || text[index - 1] == TEXT_JAPANESE_SPACE)
                {
                        index -= 1;
-                       while (text[index] == L' ')
+                       while (text[index] == L' ' || text[index] == TEXT_JAPANESE_SPACE)
                        {
                                index--;
                        }
index f0495f4..39ecbc0 100644 (file)
@@ -1932,7 +1932,7 @@ TextObject::GetTextIndexFromPositionAtLine(int lineIndex, float x, bool cursorMo
                                SysTryReturn(NID_GRP, i >= 0 && i < pSimpleText->GetTextLength(), -1, E_OUT_OF_RANGE
                                                , "[E_OUT_OF_RANGE] text index(%d) must greater than 0 and must be less than total string length(%d)",i, pSimpleText->GetTextLength());
 
-                               if (pText[i] == L' ')
+                               if (pText[i] == L' ' || pText[i] == TEXT_JAPANESE_SPACE)
                                {
                                        index--;
                                }
index af2ef8b..0307587 100644 (file)
@@ -1044,7 +1044,8 @@ TextSimple::GetWordWrapLengthEx(const wchar_t* pText, int textLength, int& actua
        {
                return TEXT_RETBY_LINEFEED;
        }
-       else if (*pLastCharacter == (wchar_t)L' ' || *pLastCharacter == TEXT_OBJ_CHARACTER)
+       else if (*pLastCharacter == (wchar_t)L' ' || *pLastCharacter == TEXT_JAPANESE_SPACE ||
+               *pLastCharacter == TEXT_OBJ_CHARACTER || *pLastCharacter == TEXT_JAPANESE_DOT|| *pLastCharacter ==  TEXT_JAPANESE_COMMA)
        {
                return TEXT_RETBY_NORMAL;
        }
@@ -1059,7 +1060,7 @@ TextSimple::GetWordWrapLengthEx(const wchar_t* pText, int textLength, int& actua
        {
                return TEXT_RETBY_NORMAL;
        }
-       else if (*pText == (wchar_t)L' ')
+       else if (*pText == (wchar_t)L' ' || *pText == TEXT_JAPANESE_SPACE)
        {
                actualLength--;
                length--;
@@ -1084,9 +1085,14 @@ TextSimple::GetWordWrapLengthEx(const wchar_t* pText, int textLength, int& actua
                return TEXT_RETBY_NORMAL;
        }
 
+       actualLength--;
+       length--;
+       pText--;
+
        while ((length >= 0) && (*pText != 0))
        {
-               if (*pText == (wchar_t)L' ' || *pText == TEXT_OBJ_CHARACTER)
+               if (*pText == (wchar_t)L' ' || *pText == TEXT_JAPANESE_SPACE || *pText == TEXT_OBJ_CHARACTER ||
+                       *pText == TEXT_JAPANESE_DOT || *pText == TEXT_JAPANESE_COMMA)
                {
                        actualLength++;
                        length++;
index 109aead..b9ee963 100644 (file)
@@ -101,6 +101,19 @@ _AccessibilityContainer::~_AccessibilityContainer(void)
        {
                _AccessibilityManager::GetInstance()->Unregister(__handle);
        }
+       int count = __childContainerList.GetCount();
+       _AccessibilityContainer* pContainer = null;
+       for (int i = 0; i< count;i++)
+       {
+               if(__childContainerList.GetAt(i, pContainer) == E_SUCCESS)
+               {
+                       pContainer->SetParent(null);
+               }
+       }
+       if(__pParent)
+       {
+               __pParent->RemoveChildContainer(*this);
+       }
 }
 
 _Control&
@@ -125,7 +138,7 @@ _AccessibilityContainer::AddChildContainer(const _AccessibilityContainer& child)
 
        result r = E_SYSTEM;
        _AccessibilityContainer* _child = &const_cast<_AccessibilityContainer&>(child);
-       _child->SetParent(*this);
+       _child->SetParent(this);
        __childContainerList.Add(_child);
        return r;
 }
@@ -150,7 +163,7 @@ _AccessibilityContainer::AddElement(const _AccessibilityElement& element)
        {
                return E_SUCCESS;
        }
-    _AccessibilityManager::GetInstance()->NeedRefreshItem();
+       _AccessibilityManager::GetInstance()->NeedRefreshItem();
        return __elementList.Add(&const_cast<_AccessibilityElement&>(element));
 }
 
@@ -166,7 +179,7 @@ _AccessibilityContainer::AddElements(const IListT<_AccessibilityElement*>& eleme
                        pElement->SetParent(*this);
                }
        }
-    _AccessibilityManager::GetInstance()->NeedRefreshItem();
+       _AccessibilityManager::GetInstance()->NeedRefreshItem();
        return __elementList.AddItems(elementList);
 }
 
@@ -174,7 +187,7 @@ result
 _AccessibilityContainer::InsertElement(const _AccessibilityElement& element, int index)
 {
        const_cast<_AccessibilityElement&>(element).SetParent(*this);
-    _AccessibilityManager::GetInstance()->NeedRefreshItem();
+       _AccessibilityManager::GetInstance()->NeedRefreshItem();
        return __elementList.InsertAt(&const_cast<_AccessibilityElement&>(element), index);
 }
 
@@ -207,7 +220,7 @@ _AccessibilityContainer::RemoveAllElement()
                }
        }
        __elementList.RemoveAll();
-    _AccessibilityManager::GetInstance()->NeedRefreshItem();
+       _AccessibilityManager::GetInstance()->NeedRefreshItem();
        return E_SUCCESS;
 }
 
@@ -441,17 +454,10 @@ _AccessibilityContainer::GetPriority(void)
 }
 
 bool
-_AccessibilityContainer::SetParent(const _AccessibilityContainer& parent)
+_AccessibilityContainer::SetParent(const _AccessibilityContainer* pParent)
 {
-       if (__pParent == null)
-       {
-               __pParent = &const_cast<_AccessibilityContainer&>(parent);
-               return true;
-       }
-       else
-       {
-               return false;
-       }
+       __pParent = const_cast<_AccessibilityContainer*>(pParent);
+       return true;
 }
 
 _AccessibilityContainer*
@@ -459,7 +465,16 @@ _AccessibilityContainer::GetParent(void) const
 {
        return __pParent;
 }
-
+_AccessibilityContainer*
+_AccessibilityContainer::GetRootParent(void) const
+{
+       _AccessibilityContainer* pParent = __pParent;
+       while(pParent != null && pParent->GetParent() != null)
+       {
+               pParent = pParent->GetParent();
+       }
+       return pParent;
+}
 void
 _AccessibilityContainer::SetCurrentFocusedElement(_AccessibilityElement*pElement)
 {
index 60e63bb..fe7b991 100644 (file)
@@ -205,11 +205,8 @@ _AccessibilityContainerImpl::RemoveElement(const _AccessibilityElementImpl& elem
        SysTryReturn(NID_UI, ControlCoreExists(__coreHandle), E_SYSTEM, E_SYSTEM,"[E_SYSTEM] A core of control is invalid.");
        AccessibilityElement* pElement = const_cast<AccessibilityElement*>(&(element.GetPublic()));
        result r = __elementList.Remove(pElement);
-       if (r == E_SUCCESS)
-       {
-               const_cast<_AccessibilityElementImpl&>(element).GetCore().Activate(false);
-               delete pElement;
-       }
+       const_cast<_AccessibilityElementImpl&>(element).GetCore().Activate(false);
+       delete pElement;
        return r;
 }
 
@@ -234,6 +231,20 @@ _AccessibilityContainerImpl::RemoveAllElement(void)
                }
                __elementList.RemoveAll();
        }
+       if (__pCore)
+       {
+               LinkedListT<_AccessibilityElement*> list;
+               __pCore->GetElements(list);
+               int count = list.GetCount();
+               for (int i = 0; i < count; i++)
+               {
+                       _AccessibilityElement* pElement = null;
+                       if (list.GetAt(i, pElement) == E_SUCCESS)
+                       {
+                               pElement->Activate(false);
+                       }
+               }
+       }
        return r;
 }
 
@@ -281,7 +292,7 @@ _AccessibilityContainerImpl::OnAccessibilityFocusMovedPrevious(const _Accessibil
        return true;
 }
 bool
-_AccessibilityContainerImpl::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_AccessibilityContainerImpl::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        int count = __listenerList.GetCount();
        if (count > 0)
index 18d684c..17e9469 100644 (file)
@@ -223,10 +223,6 @@ void
 _AccessibilityElement::Activate(bool enable)
 {
        __activated = enable;
-       if(enable == false)
-       {
-               __pUserData = null;
-       }
 }
 bool
 _AccessibilityElement::IsActivated(void) const
index 0d0de7b..8033b39 100644 (file)
@@ -29,7 +29,7 @@ _AccessibilityElementImpl::_AccessibilityElementImpl(const AccessibilityElement&
        , __pCore(null)
 {
        __pPublic = &const_cast<AccessibilityElement&>(element);
-       __pCore = new (std::nothrow) _AccessibilityElement();
+       __pCore = new (std::nothrow) _AccessibilityElement(false);
        SysTryReturn(NID_UI, __pCore, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation is failed");
        __pCore->SetUserData(this);
 }
@@ -47,15 +47,23 @@ _AccessibilityElementImpl::~_AccessibilityElementImpl(void)
 {
        if (__pCore)
        {
-               if(__pCore->GetParent() == null)
+               if(__pCore->IsSystemElement())
                {
-                       delete __pCore;
+                       __pCore->Activate(false);
+                       __pCore->SetUserData(null);
                        __pCore = null;
                }
                else
                {
-                       __pCore->Activate(false);
-                       __pCore->SetUserData(null);
+                       _AccessibilityContainer* pContainer = __pCore->GetParent();
+                       if(pContainer != null)
+                       {
+                               pContainer->RemoveElement(*__pCore);
+                       }
+                       else
+                       {
+                               delete __pCore;
+                       }
                        __pCore = null;
                }
        }
index b63a2ea..f7fb09b 100644 (file)
@@ -31,6 +31,7 @@
 #include <FGrpBitmap.h>
 #include <FBase_StringConverter.h>
 #include <FGrp_BitmapImpl.h>
+#include <FSys_SystemTimeImpl.h>
 #include "FUi_AccessibilityGesture.h"
 #include "FUi_AccessibilitySystemSettingLoader.h"
 #include "FUi_AccessibilityTtsPlayer.h"
@@ -54,7 +55,7 @@ using namespace Tizen::Base::Runtime;
 using namespace Tizen::Graphics;
 using namespace Tizen::Ui::Animations;
 using namespace Tizen::Ui::Controls;
-
+using namespace Tizen::System;
 namespace
 {
 class GuidePopupTimer
@@ -520,7 +521,6 @@ _AccessibilityManager::ShowPopup(const String& content)
        }
 
        pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
-
        if (pFrame != null)
        {
                int accesibilityVisualElementLevel = 3000;
@@ -1185,7 +1185,7 @@ _AccessibilityManager::OnFinishReading(const Tizen::Base::String& grammar)
                        {
                                if (__pTargetElement)
                                {
-                                       pListener->OnAccessibilityReadedElement(*__pTargetContainer, *__pTargetElement);
+                                       pListener->OnAccessibilityReadElement(*__pTargetContainer, *__pTargetElement);
                                }
                        }
                }
@@ -1287,8 +1287,52 @@ _AccessibilityManager::MakeList(void)
                controlList.Add(pControl);
        }
        DownVisitor(*pControl, controlList);
-       _AccessibilityItemComparer<_Control*> controlComparer;
-       //controlList.Sort(controlComparer);
+       count = controlList.GetCount();
+       Dimension screen = _ResourceManager::GetInstance()->GetLogicalScreenSizen();
+       int margin = _ControlManager::GetInstance()->GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT ? screen.width : screen.height;
+
+       for(int i = 0 ; i < count ; i++)
+       {
+               if (controlList.GetAt(i, pControl) == E_SUCCESS)
+               {
+                       FloatRectangle rect = pControl->GetAbsoluteBoundsF();
+                       if (rect.x + rect.width <= 0.0f || (rect.x) >= margin)
+                       {
+                               bool inside = false;
+                               _Control* _pControl = pControl;
+                               while(_pControl)
+                               {
+                                       if(dynamic_cast<_IScrollableContainer*>(_pControl))
+                                       {
+                                               if (rect.x + rect.width > 0.0f && (rect.x) < margin)
+                                               {
+                                                       inside = true;
+                                                       break;
+                                               }
+                                       }
+                                       _pControl = _pControl->GetParent();
+                               }
+                               if(!inside)
+                               {
+                                       _AccessibilityContainer* pContainer = pControl->GetAccessibilityContainer()->GetRootParent();
+                                       if(pContainer != null)
+                                       {
+                                               rect = pContainer->GetAbsoluteBounds();
+                                               if (rect.x + rect.width > 0.0f && (rect.x) < margin)
+                                               {
+                                                       inside = true;
+                                               }
+                                       }
+                               }
+                               if(!inside)
+                               {
+                                       controlList.Remove(pControl);
+                                       i--;
+                                       count--;
+                               }
+                       }
+               }
+       }
        for (int i = 0; i < controlList.GetCount() ; i++)
        {
                if (controlList.GetAt(i, pControl) == E_SUCCESS)
@@ -1447,10 +1491,6 @@ _AccessibilityManager::MakeList(void)
        }
 
        _AccessibilityElement* pElement = null;
-
-       Dimension screen = _ResourceManager::GetInstance()->GetLogicalScreenSizen();
-       int margin = _ControlManager::GetInstance()->GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT ? screen.width : screen.height;
-
        for (int i = 0 ; i < count ; i++)
        {
                r = __candidateList.GetAt(i, pElement);
@@ -1463,13 +1503,6 @@ _AccessibilityManager::MakeList(void)
                        __candidateList.Remove(pElement);
                        __candidateList.InsertAt(pElement, 0);
                }
-               if (pElement->GetAbsoluteBounds().x + pElement->GetAbsoluteBounds().width <= 1.0
-                       || (int)(pElement->GetAbsoluteBounds().x) >= margin - 1)
-               {
-                       __candidateList.Remove(pElement);
-                       i--;
-                       count--;
-               }
        }
        return;
 }
@@ -1826,8 +1859,21 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                                SetGestureMode(MODE_TAP);
                                __candidateList.RemoveAll();
                        }
+                       _Control* pControl = null;
                        Point pt((int)point.x, (int)point.y);
-                       _Control* pControl = _ControlManager::GetInstance()->GetTopmostTouchedControl(pt);
+                       _TouchManager* pTouchManager = _TouchManager::GetInstance();
+                       _Control* pCapturedControl = pTouchManager->GetCapturedControl();
+                       if (pCapturedControl)
+                       {
+                               if(pCapturedControl->GetAbsoluteBounds().Contains(pt))
+                               {
+                                       pControl = pCapturedControl;
+                               }
+                       }
+                       else
+                       {
+                               pControl = _ControlManager::GetInstance()->GetTopmostTouchedControl(pt);
+                       }
                        if (pControl == null)
                        {
                                return false;
@@ -1954,13 +2000,17 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                                ReadContent(L"Unavailable");
                                return true;
                        }
-
                        if (__pTargetElement->GetSupportOperatingGesture())
                        {
+                               long long tick = 0;
+                               if (_SystemTimeImpl::GetTicks(tick) != E_SUCCESS)
+                               {
+                                       tick = 0;
+                               }
                                FloatRectangle rect = __pTargetElement->GetAbsoluteBounds();
                                Point _point((int)(rect.x + rect.width/2), (int)(rect.y + rect.height/2));
-                               _UiTouchEvent pressedEvent(_pControl->GetHandle(), _TouchInfo(0, _TOUCH_PRESSED, _point, false, 0));
-                               _UiTouchEvent releasedEvent(_pControl->GetHandle(), _TouchInfo(0, _TOUCH_RELEASED, _point, false, 0));
+                               _UiTouchEvent pressedEvent(_pControl->GetHandle(), _TouchInfo(0, _TOUCH_PRESSED, _point, false, tick));
+                               _UiTouchEvent releasedEvent(_pControl->GetHandle(), _TouchInfo(0, _TOUCH_RELEASED, _point, false, tick+1));
                                pressedEvent.SetAccessibilityEvent(true);
                                releasedEvent.SetAccessibilityEvent(true);
 
@@ -2066,32 +2116,42 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                        _Control* pControl = _ControlManager::GetInstance()->GetTopmostTouchedControl(pt);
                        if (pControl == null)
                        {
+                               SysLog(NID_UI, "Two finger panning is started. but control is null");
                                return false;
                        }
-
-                       _UiTouchEvent pressedEvent(pControl->GetHandle(), _TouchInfo(0, _TOUCH_PRESSED, pt, false, 0));
+                       long long tick = 0;
+                       if (_SystemTimeImpl::GetTicks(tick) != E_SUCCESS)
+                       {
+                               tick = 0;
+                       }
+                       _UiTouchEvent pressedEvent(pControl->GetHandle(), _TouchInfo(0, _TOUCH_PRESSED, pt, false, tick));
                        unsigned int pointId = 0;
                        pointId = _TouchManager::GetInstance()->GeneratePointId(0);
                        _UiEventManager::GetInstance()->SendEvent(pressedEvent);
                        __pPanningControl = pControl;
-                       _UiTouchEvent movedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_MOVED, pt, false, 0));
-                       pointId = _TouchManager::GetInstance()->GetPointId(0);
-                       _UiEventManager::GetInstance()->SendEvent(movedEvent);
                        SetGestureMode(MODE_PANNING);
-               }
+                       SysLog(NID_UI, "Two finger panning is started. x:%d, y:%d", pt.x, pt.y);
+                       }
                        break;
                case _ACCESSIBILITY_GESTURE_TYPE_TWO_FINGER_PANNING_CHANGED:
                {
                        if (__pPanningControl == null || GetGestureMode() != MODE_PANNING)
                        {
                                SetGestureMode(MODE_TAP);
+                               SysLog(NID_UI, "Two finger panning is started. but control is null");
                                return false;
                        }
+                       long long tick = 0;
+                       if (_SystemTimeImpl::GetTicks(tick) != E_SUCCESS)
+                       {
+                               tick = 0;
+                       }
                        Point pt((int)point.x, (int)point.y);
-                       _UiTouchEvent movedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_MOVED, pt, false, 0));
+                       _UiTouchEvent movedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_MOVED, pt, false, tick));
                        unsigned int pointId = 0;
                        pointId = _TouchManager::GetInstance()->GetPointId(0);
                        _UiEventManager::GetInstance()->SendEvent(movedEvent);
+                       SysLog(NID_UI, "Two finger panning is moved. x:%d, y:%d", pt.x, pt.y);
                }
                        break;
                case _ACCESSIBILITY_GESTURE_TYPE_TWO_FINGER_PANNING_FINISHED:
@@ -2099,15 +2159,22 @@ _AccessibilityManager::ProcessGesture(_AccessibilityGestureType type, const Floa
                        if (__pPanningControl == null || GetGestureMode() != MODE_PANNING)
                        {
                                SetGestureMode(MODE_TAP);
+                               SysLog(NID_UI, "Two finger panning is started. but control is null");
                                return false;
                        }
+                       long long tick = 0;
+                       if (_SystemTimeImpl::GetTicks(tick) != E_SUCCESS)
+                       {
+                               tick = 0;
+                       }
                        Point pt((int)point.x, (int)point.y);
-                       _UiTouchEvent releasedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_RELEASED, pt, false, 0));
+                       _UiTouchEvent releasedEvent(__pPanningControl->GetHandle(), _TouchInfo(0, _TOUCH_RELEASED, pt, false, tick));
                        unsigned int pointId = 0;
                        pointId = _TouchManager::GetInstance()->GetPointId(0);
                        _UiEventManager::GetInstance()->SendEvent(releasedEvent);
                        __pPanningControl = null;
                        SetGestureMode(MODE_TAP);
+                       SysLog(NID_UI, "Two finger panning is finished. x:%d, y:%d", pt.x, pt.y);
                }
                        break;
                default:
index 99ca14d..9e9e7f5 100644 (file)
@@ -2526,6 +2526,12 @@ _Control::SetFocused(bool on)
                                IsFocusable(), E_INVALID_OPERATION,
                                E_INVALID_OPERATION, "[E_INVALID_OPERATION] This Control isn't focusable control.");
 
+       bool isVisible = IsVisible();
+       if (isVisible == false)
+       {
+               return E_SUCCESS;
+       }
+
        if (on)
        {
                _Window* pTop = GetRootWindow();
index 3779441..cc7f28c 100644 (file)
@@ -53,6 +53,7 @@
 #include "FUi_WindowImpl.h"
 #include "FUiAnim_VisualElement.h"
 #include "FUiAnim_VisualElementImpl.h"
+#include "FUiCtrl_Popup.h"
 
 //#define _TC_PASS
 
@@ -63,6 +64,7 @@ using namespace Tizen::Graphics;
 using namespace Tizen::Ui::Animations;
 using namespace Tizen::App;
 using namespace Tizen::Base::Utility;
+using namespace Tizen::Ui::Controls;
 
 namespace Tizen { namespace Ui {
 
@@ -3572,49 +3574,94 @@ _ControlImpl::GetSizeF(void) const
        return GetCore().GetSizeF();
 }
 
-void
-_ControlImpl::UpdateBuilderBounds(const Tizen::Graphics::FloatRectangle& bounds)
+_ControlOrientation
+_ControlImpl::GetUiBuilderOrientation(void) const
 {
-       FloatRectangle builderBounds;
        _ControlOrientation controlOrientation = _CONTROL_ORIENTATION_PORTRAIT;
-       bool exist = GetBuilderBoundsF(controlOrientation, builderBounds);
-       if (exist)
+
+       _Window* pWindow = GetCore().GetRootWindow();
+       if (!pWindow)
        {
-               if (IsAttachedToMainTree())
+               return controlOrientation;
+       }
+
+       _ControlImplManager* pControlImplManager = _ControlImplManager::GetInstance();
+       if (!pControlImplManager)
+       {
+               return controlOrientation;
+       }
+
+       if (pWindow->IsOrientationRoot())
+       {
+               // Frame
+               OrientationStatus status = pControlImplManager->GetFormOrientationStatus(this);
+
+               if ((status == ORIENTATION_STATUS_LANDSCAPE) || (status == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
                {
-                       _Window* pWindow = GetCore().GetRootWindow();
-                       if (pWindow->IsOrientationRoot())
-                       {
-                               // Frame
-                               _ControlImplManager* pControlImplManager = _ControlImplManager::GetInstance();
-                               OrientationStatus orientationStatus = pControlImplManager->GetFormOrientationStatus(this);
+                       controlOrientation = _CONTROL_ORIENTATION_LANDSCAPE;
+               }
+               else
+               {
+                       controlOrientation = _CONTROL_ORIENTATION_PORTRAIT;
+               }
+       }
+       else
+       {
+               // Ownee Window
+               bool owner = false;
 
-                               if ((orientationStatus == ORIENTATION_STATUS_LANDSCAPE) || (orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
-                               {
-                                       controlOrientation = _CONTROL_ORIENTATION_LANDSCAPE;
-                               }
-                               else
-                               {
-                                       controlOrientation = _CONTROL_ORIENTATION_PORTRAIT;
-                               }
-                       }
-                       else
+               Tizen::Ui::Controls::_Popup* pPopup = dynamic_cast<Tizen::Ui::Controls::_Popup*>(pWindow);
+               if (pPopup)
+               {
+                       if (pWindow->IsOrientationCallbackModeEnabled() == false)
                        {
-                               // Window
-                               controlOrientation = GetCore().GetOrientation();
+                               owner = true;
                        }
+               }
 
-                       if (controlOrientation == _CONTROL_ORIENTATION_LANDSCAPE)
-                       {
-                               SetBuilderBounds(_CONTROL_ORIENTATION_LANDSCAPE, bounds);
-                       }
-                       else
+               if (owner)
+               {
+                       _Control* pOwner = pWindow->GetOwner();
+                       if (pOwner)
                        {
-                               SetBuilderBounds(_CONTROL_ORIENTATION_PORTRAIT, bounds);
+                               _ControlImpl* pControlImpl = static_cast<_ControlImpl*>(pOwner->GetUserData());
+                               if (pControlImpl)
+                               {
+                                       OrientationStatus status = pControlImplManager->GetFormOrientationStatus(pControlImpl);
+                                       if ((status == ORIENTATION_STATUS_LANDSCAPE) || (status == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                                       {
+                                               controlOrientation = _CONTROL_ORIENTATION_LANDSCAPE;
+                                       }
+                                       else
+                                       {
+                                               controlOrientation = _CONTROL_ORIENTATION_PORTRAIT;
+                                       }
+                               }
                        }
                }
                else
                {
+                       controlOrientation = GetCore().GetOrientation();
+               }
+       }
+
+       return controlOrientation;
+}
+
+void
+_ControlImpl::UpdateBuilderBounds(const Tizen::Graphics::FloatRectangle& bounds)
+{
+       FloatRectangle builderBounds;
+       _ControlOrientation controlOrientation = GetUiBuilderOrientation();
+       bool exist = GetBuilderBoundsF(controlOrientation, builderBounds);
+       if (exist)
+       {
+               if (IsAttachedToMainTree())
+               {
+                       SetBuilderBounds(controlOrientation, bounds);
+               }
+               else
+               {
                        SetBuilderBounds(_CONTROL_ORIENTATION_PORTRAIT, bounds);
                        SetBuilderBounds(_CONTROL_ORIENTATION_LANDSCAPE, bounds);
                }
@@ -3625,7 +3672,7 @@ void
 _ControlImpl::UpdateBuilderSize(const Tizen::Graphics::FloatDimension& dimension)
 {
        FloatRectangle builderBounds;
-       _ControlOrientation controlOrientation = GetCore().GetOrientation();
+       _ControlOrientation controlOrientation = GetUiBuilderOrientation();
 
        bool exist = GetBuilderBoundsF(controlOrientation, builderBounds);
        if (exist)
@@ -3636,6 +3683,21 @@ _ControlImpl::UpdateBuilderSize(const Tizen::Graphics::FloatDimension& dimension
        }
 }
 
+void
+_ControlImpl::UpdateBuilderPosition(const FloatPoint& position)
+{
+       FloatRectangle builderBounds;
+       _ControlOrientation controlOrientation = GetUiBuilderOrientation();
+
+       bool exist = GetBuilderBoundsF(controlOrientation, builderBounds);
+       if (exist)
+       {
+               builderBounds.x = position.x;
+               builderBounds.y = position.y;
+               UpdateBuilderBounds(builderBounds);
+       }
+}
+
 result
 _ControlImpl::SetBounds(const Rectangle& bounds, bool callBoundsChangeCallbacks)
 {
@@ -3675,12 +3737,14 @@ _ControlImpl::SetBoundsAndUpdateLayoutF(const Tizen::Graphics::FloatRectangle& b
 result
 _ControlImpl::SetPosition(const Point& position)
 {
+       UpdateBuilderPosition(_CoordinateSystemUtils::ConvertToFloat(position));
        return GetCore().SetPosition(position);
 }
 
 result
 _ControlImpl::SetPosition(const FloatPoint& position)
 {
+       UpdateBuilderPosition(position);
        return GetCore().SetPosition(position);
 }
 
index 36d85f3..c3de664 100644 (file)
@@ -348,15 +348,16 @@ _ControlImplManager::GetOrientationStatus(Orientation mode) const
 }
 
 OrientationStatus
-_ControlImplManager::GetFormOrientationStatus(_ControlImpl* pControlImpl)
+_ControlImplManager::GetFormOrientationStatus(const _ControlImpl* pControlImpl) const
 {
-       _FormImpl* pParentImpl = null;
+       const _FormImpl* pFormImpl = null;
        OrientationStatus orientation = ORIENTATION_STATUS_NONE;
+       
        while(pControlImpl)
        {
-               pParentImpl = dynamic_cast<_FormImpl*>(pControlImpl->GetParent());
+               pFormImpl = dynamic_cast<const _FormImpl*>(pControlImpl);
 
-               if (pParentImpl != null)
+               if (pFormImpl)
                {
                        break;
                }
@@ -366,9 +367,9 @@ _ControlImplManager::GetFormOrientationStatus(_ControlImpl* pControlImpl)
                }
        }
 
-       if (pParentImpl)
+       if (pFormImpl)
        {
-               orientation = pParentImpl->GetOrientationStatus();
+               orientation = pFormImpl->GetOrientationStatus();
        }
 
        return orientation;
index f0a4b82..4cfc4de 100644 (file)
@@ -177,6 +177,7 @@ OnWindowPropertyChanged(void* pData, int type, void* pEvent)
                        SysLog(NID_UI, "[Clipboard] Clipboard is closed.");
                        _Clipboard::GetInstance()->FirePopupEvent(_CLIPBOARD_POPUP_STATE_CLOSED, 0, 0);
                        __clipboardHeight = 0;
+                       _Clipboard::GetInstance()->HidePopup();
                }
        }
        else if (pEv->atom == ECORE_X_ATOM_E_ILLUME_CLIPBOARD_GEOMETRY)
index d691340..6a44708 100644 (file)
@@ -117,10 +117,7 @@ public:
 
                if (pLongPressGesture)
                {
-                       if (pLongPressGesture->IsTouchCanceled())
-                       {
-                               pLongPressGesture->ResetGestureTimerManager();
-                       }
+                       pLongPressGesture->ResetGestureTimerManager();
                }
        }
 
index f95893a..681e58b 100644 (file)
@@ -572,6 +572,10 @@ _MultiFingerInfo::SetFingerInfo(unsigned long pointId, const FloatPoint& point,
                }
                break;
 
+       case _TOUCH_CANCELED:
+               pFingerInfo->SetStatus(_TOUCH_CANCELED);
+               break;
+
        default:
                break;
        }
@@ -839,11 +843,14 @@ _TouchManager::SetTouchCanceled(_Control* pControl)
                _UiEventManager* pEventManager = _UiEventManager::GetInstance();
                SysTryReturnVoidResult(NID_UI, pEventManager, E_SYSTEM, "[E_SYSTEM] _UiEventManager does not exist.");
 
-               pEventManager->SendEvent(event);
-
                _TouchManager* pTouchManager = _TouchManager::GetInstance();
                SysTryReturnVoidResult(NID_UI, pTouchManager, E_SYSTEM, "[E_SYSTEM] _TouchManager does not exist.");
 
+               result r = pTouchManager->AddPoint(touchInfo.GetPointId(), currentPoint, _TOUCH_CANCELED);
+               SysTryReturnVoidResult(NID_UI, r == E_SUCCESS, E_SYSTEM, "[E_SYSTEM] System error occurred.");
+
+               pEventManager->SendEvent(event);
+
                IListT<_FingerInfo*>* pFingerInfoList = pTouchManager->GetMultiFingerInfoListN();
                SysTryReturnVoidResult(NID_UI, pFingerInfoList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
index 14f13f2..26a0496 100644 (file)
@@ -765,6 +765,7 @@ _Window::_Window()
 #endif
        , __preferredRotation(false)
 #endif
+       , __orientationCallbackMode(false)
 {
        SetControlDelegate(*this);
        SetWindowDelegate(*this);
@@ -864,4 +865,16 @@ _Window::GetDimmingLayer(void)
        return __pDimmingLayer;
 }
 
+void
+_Window::SetOrientationCallbackModeEnabled(bool enable)
+{
+       __orientationCallbackMode = enable;
+}
+
+bool
+_Window::IsOrientationCallbackModeEnabled(void) const
+{
+       return __orientationCallbackMode;
+}
+
 }} // Tizen::Ui
index 99136b3..cfd1748 100644 (file)
@@ -137,6 +137,12 @@ _AnimationManager::_AnimationManager(void)
 
 _AnimationManager::~_AnimationManager(void)
 {
+       if (__pCurrentTransaction)
+       {
+               delete __pCurrentTransaction;
+               __pCurrentTransaction = null;
+       }
+
        __committedList.RemoveAllNodes();
 }
 
index c5c20ec..b0fde87 100644 (file)
@@ -274,11 +274,7 @@ _DisplayManager::PostRender(_RootVisualElement& root)
        {
                _VisualElementImpl* pRootPresentationImpl = _VisualElementImpl::GetInstance(*pPresentationRoot);
 
-#ifdef OLD
-               if (likely((pRootPresentationImpl->__childrenNeedsUpdateProps & ~_VisualElementImpl::HIERARCHY_PROPERTY_CONTENT) != 0) ||
-#else
                if (likely(pRootPresentationImpl->__childrenNeedsUpdateProps) ||
-#endif
                        likely(pRootPresentationImpl->__pSharedData->NeedNativeReconfigure()) ||
                        unlikely(root.GetNeedsContentUpdate()) ||
                        unlikely(pPresentationRoot->GetNeedsContentUpdate()))
index df5320c..68b14ff 100644 (file)
@@ -195,13 +195,8 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& element)
        , __decomposedTransform()
        , __childrenTransform()
        , __decomposedChildrenTransform()
-#ifdef OLD
-       , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK & ~HIERARCHY_PROPERTY_CONTENT)
-       , __invalidatedProps(HIERARCHY_PROPERTY_MASK& ~HIERARCHY_PROPERTY_CONTENT)
-#else
        , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK)
        , __invalidatedProps(HIERARCHY_PROPERTY_MASK)
-#endif
        , __matrixFromTopValid(false)
        , __matrixFromTopInvertible(true)
        , __matrixToSuperValid(false)
@@ -258,13 +253,8 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& presentation, _VisualEleme
        , __decomposedTransform(modelImpl.__decomposedTransform)
        , __childrenTransform(modelImpl.__childrenTransform)
        , __decomposedChildrenTransform(modelImpl.__decomposedChildrenTransform)
-#ifdef OLD
-       , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK & ~HIERARCHY_PROPERTY_CONTENT)
-       , __invalidatedProps(HIERARCHY_PROPERTY_MASK & ~HIERARCHY_PROPERTY_CONTENT)
-#else
        , __childrenNeedsUpdateProps(HIERARCHY_PROPERTY_MASK)
        , __invalidatedProps(HIERARCHY_PROPERTY_MASK)
-#endif
        , __matrixFromTopValid(false)
        , __matrixFromTopInvertible(true)
        , __matrixToSuperValid(false)
@@ -294,14 +284,7 @@ _VisualElementImpl::_VisualElementImpl(VisualElement& presentation, _VisualEleme
 {
        ClearLastResult();
 
-       //GetSharedData().AddRef();
-
        __children.Construct();
-
-       //GetSharedData().invalidatedNativeProps = HIERARCHY_PROPERTY_MASK;
-
-       // for MODEL object
-       //modelImpl.__pPresentation = this;
 }
 
 _VisualElementImpl::~_VisualElementImpl(void)
@@ -321,13 +304,6 @@ _VisualElementImpl::~_VisualElementImpl(void)
        {
                __pDestroyedCallback(__pDestroyedCallbackData);
        }
-
-
-       // Remove property observer finally
-//     if (IsPropertyChangeEventListenerAdded())
-//     {
-//             RemovePropertyChangeEventListener(_VisualElementModelObserver::GetInstance());
-//     }
 }
 
 void
@@ -1021,9 +997,6 @@ _VisualElementImpl::SetSurfaceChanged(void)
                                pElement->GetSharedData().childrenSurfaceChanged = true;
                                pElement = pElement->__pParent;
                        }
-#ifdef OLD
-                       __pPresentation->InvalidateHierarchyProps(HIERARCHY_PROPERTY_SURFACE, false, false);
-#endif
                }
        }
        else
@@ -1034,9 +1007,6 @@ _VisualElementImpl::SetSurfaceChanged(void)
                        pElement->GetSharedData().childrenSurfaceChanged = true;
                        pElement = pElement->__pParent;
                }
-#ifdef OLD
-               InvalidateHierarchyProps(HIERARCHY_PROPERTY_SURFACE, false, false);
-#endif
        }
 }
 
@@ -1079,14 +1049,10 @@ result
 _VisualElementImpl::SetContentBounds(const FloatRectangle& contentBounds)
 {
        SysTryReturnResult(NID_UI_ANIM, IS_MODEL(this), E_INVALID_OPERATION, "VisualElement is not Model object.");
-#if 0
-       return SetContentBoundsI(contentBounds);
-#else
        result r = InvokeOnSetPropertyRequested(*pVePropContentBounds, Variant(contentBounds));
        SysTryLog(NID_UI_ANIM, r == E_SUCCESS, "[%s] Propagating.", GetErrorMessage(r));
 
        return r;
-#endif
 }
 
 FloatRectangle
@@ -1119,16 +1085,7 @@ _VisualElementImpl::GetImplicitAnimationEnabled(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       bool isImplicitAnimationEnabled = InvokeOnGetPropertyRequested(*pVePropImplicitAnimationEnabled).ToBool();
-       if (GetLastResult() != E_SUCCESS)
-               return false;
-
-       return isImplicitAnimationEnabled;
-#else
        return __isImplicitAnimationEnabled;
-#endif
 }
 
 result
@@ -1180,18 +1137,7 @@ _VisualElementImpl::GetBounds(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       FloatRectangle bounds = InvokeOnGetPropertyRequested(*pVePropBounds).ToFloatRectangle();
-       if (GetLastResult() != E_SUCCESS)
-       {
-               return FloatRectangle();
-       }
-
-       return bounds;
-#else
        return __bounds;
-#endif
 }
 
 result
@@ -1275,9 +1221,6 @@ _VisualElementImpl::SetBoundsI(const FloatRectangle& bounds)
                if (unlikely(!NEED_SURFACE(this)))
                        InvalidateVisibleRectToRenderTarget(null);
 
-       //      if (sizeChanged)
-       //              SysLog(NID_UI_ANIM, "size changing to " VELOGRECTTAG, VELOGRECT(boundsAdjusted));
-
                __bounds.x = boundsAdjusted.Left();
                __bounds.y = boundsAdjusted.Top();
                __bounds.width = newWidth;
@@ -1404,18 +1347,7 @@ _VisualElementImpl::GetZPosition(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       float zPosition = (const_cast< _VisualElementImpl* >(this))->InvokeOnGetPropertyRequested(*pVePropZPosition).ToFloat();
-       if (GetLastResult() != E_SUCCESS)
-       {
-               return 0.0f;
-       }
-
-       return zPosition;
-#else
        return __zPosition;
-#endif
 }
 
 result
@@ -1552,63 +1484,12 @@ _VisualElementImpl::IsVisible(void) const
        return IsVisibleI();
 }
 
-#if 0
-bool
-_VisualElementImpl::IsVisibleI(void) const
-{
-#if 0
-       const _VisualElementImpl* pElement = this;
-       const _VisualElementImpl* pRoot = GetRoot();
-
-       if (unlikely(!pRoot))
-               return false;
-
-       while (pElement)
-       {
-               if (!VE_VISIBLE(pElement))
-               {
-                       return false;
-               }
-
-#if 0
-               if (!pElement->__pParent)
-               {
-                       if (dynamic_cast< const _RootVisualElement* >(pElement) == null)
-                       {
-                               return false;
-                       }
-               }
-#else
-               if (!pElement->__pParent && pElement != pRoot)
-                       return false;
-#endif
-
-               pElement = pElement->__pParent;
-       }
-
-       return true;
-#else
-       if (unlikely(IsPropsInvalidated(HIERARCHY_PROPERTY_COORDINATES)))
-       {
-               const_cast< _VisualElementImpl* >(this)->RebuildCoordinates();
-       }
-
-       return __isVisible;
-#endif
-}
-#endif
-
 bool
 _VisualElementImpl::GetShowState(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropShowState).ToBool();
-#else
        return VE_VISIBLE(this);
-#endif
 }
 
 result
@@ -1810,12 +1691,7 @@ _VisualElementImpl::GetContentOpacity(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropContentOpacity).ToFloat();
-#else
        return __contentOpacity;
-#endif
 }
 
 result
@@ -1895,12 +1771,7 @@ _VisualElementImpl::GetOpacity(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropOpacity).ToFloat();
-#else
        return __opacity;
-#endif
 }
 
 result
@@ -1976,12 +1847,7 @@ _VisualElementImpl::GetAnchor(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropAnchor).ToFloatPoint();
-#else
        return __anchor;
-#endif
 }
 
 result
@@ -2057,12 +1923,7 @@ _VisualElementImpl::GetAnchorZ(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropAnchorZ).ToFloat();
-#else
        return __anchorZ;
-#endif
 }
 
 result
@@ -2138,12 +1999,7 @@ _VisualElementImpl::GetTransformMatrix(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropTransform).ToFloatMatrix4();
-#else
        return __transform;
-#endif
 }
 
 result
@@ -2820,12 +2676,7 @@ _VisualElementImpl::GetChildrenTransformMatrix(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropChildrenTransform).ToFloatMatrix4();
-#else
        return __childrenTransform;
-#endif
 }
 
 
@@ -3501,12 +3352,7 @@ _VisualElementImpl::IsClipToParent(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropClipToParent).ToBool();
-#else
        return false;
-#endif
 }
 
 // TBD: clipToParent is not animatable, right??
@@ -3601,12 +3447,7 @@ _VisualElementImpl::IsSurfaceOpaque(void) const
 {
        ClearLastResult();
 
-       // TBD: forward using property or direct return ?
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropSurfaceOpaque).ToBool();
-#else
        return GetSharedData().isSurfaceOpaque;
-#endif
 }
 
 result
@@ -4530,11 +4371,7 @@ _VisualElementImpl::GetName(void) const
 {
        ClearLastResult();
 
-#if 0
-       return InvokeOnGetPropertyRequested(*pVePropName).ToString();
-#else
        return GetSharedData().name;
-#endif
 }
 
 result
@@ -4669,13 +4506,6 @@ _VisualElementImpl::GetDrawableRect(void) const
        // WARNING:
        //      Even when surface exists, the size might be invalidated by changing bounds.
        //
-#if 0
-       RebuildHierarchyProps(HIERARCHY_PROPERTY_MASK & (~HIERARCHY_PROPERTY_CONTENT), true);
-       if (!HAVE_SURFACE(this))
-       {
-               return __visibleRect;
-       }
-#endif
        if (HAVE_SURFACE(this) && GetSharedData().fixedSurfaceSize)
        {
                return FloatRectangle(0.0f, 0.0f, GetSharedData().pSurface->GetSizeF().width, GetSharedData().pSurface->GetSizeF().height);
@@ -4715,51 +4545,9 @@ _VisualElementImpl::GetBoundingBoxI(void) const
 
        if (unlikely(!__boundingBoxValid))
        {
-#if 0
-               float x[4] = { 0.0f, __bounds.width, 0.0f, __bounds.width };
-               float y[4] = { 0.0f, 0.0f, __bounds.height, __bounds.height };
-               float z[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
-
-               for (int i = 0; i < 4; i++)
-               {
-                       _MatrixUtilTransform(GetMatrixToTop(), &x[i], &y[i], &z[i]);
-               }
-
-               pThis->__boundingBox.SetBounds(x[0], y[0], x[0], y[0]);
-
-               float l = x[0];
-               float r = x[0];
-               float t = y[0];
-               float b = y[0];
-               for (int i = 1; i < 4; i++)
-               {
-                       if (x[i] < l)
-                       {
-                               l = x[i];
-                       }
-
-                       if (y[i] < t)
-                       {
-                               t = y[i];
-                       }
-
-                       if (x[i] > r)
-                       {
-                               r = x[i];
-                       }
-
-                       if (y[i] > b)
-                       {
-                               b = y[i];
-                       }
-               }
-
-               pThis->__boundingBox.SetBounds(l, t, r - l, b - t);
-#else
                float x[4] = { 0.0f, __bounds.width, 0.0f, __bounds.width };
                float y[4] = { 0.0f, 0.0f, __bounds.height, __bounds.height };
                CalculateBoundingBox(x, y, pThis->__boundingBox);
-#endif
 
                pThis->__boundingBoxValid = true;
        }
@@ -5221,13 +5009,6 @@ _VisualElementImpl::RebuildHierarchyProps(int props, bool checkSurface, bool rec
                return;
        }
 
-#ifdef OLD
-       if (unlikely(props & HIERARCHY_PROPERTY_SURFACE) && unlikely(IsPropsInvalidated(HIERARCHY_PROPERTY_SURFACE)))
-       {
-               SetPropsValidaty(HIERARCHY_PROPERTY_SURFACE, 0);
-       }
-#endif
-
        if (likely(props & HIERARCHY_PROPERTY_CONTENTBOUNDS) && likely(IsPropsInvalidated(HIERARCHY_PROPERTY_CONTENTBOUNDS)))
        {
                SetPropsValidaty(HIERARCHY_PROPERTY_CONTENTBOUNDS, 0);
@@ -5281,11 +5062,7 @@ _VisualElementImpl::UpdateHierarchyProps(void)
 {
        // WARNING:
        //      HIERARCHY_PROPERTY_CONTENT is not handled here, but in drawing logic.
-#ifdef OLD
-       const int mask = HIERARCHY_PROPERTY_MASK & (~HIERARCHY_PROPERTY_CONTENT);
-#else
        const int mask = HIERARCHY_PROPERTY_MASK;
-#endif
 
        if (unlikely((__childrenNeedsUpdateProps & mask) == 0 && GetSharedData().childrenSurfaceChanged == false))
                return;
@@ -5318,12 +5095,6 @@ _VisualElementImpl::ExposeRectangle(const FloatRectangle* pDirtyRectangle, bool
        {
                InvalidateRectangleI(pDirtyRectangle);
        }
-#if 0   // exposing object without content changes is not needed for EFL
-       else
-       {
-               SetFlushNeeded();
-       }
-#endif
 }
 
 result
@@ -5371,9 +5142,6 @@ _VisualElementImpl::Flush(void)
 result
 _VisualElementImpl::InvalidateRectangle(const FloatRectangle* pRectangle)
 {
-//!!! don't have to check attached state
-//     SysTryReturnResult(NID_UI_ANIM, IS_ATTACHED(this), E_INVALID_STATE, "Invalidating VisualElement should be attached to the root tree.");
-
        return InvalidateRectangleI(pRectangle);
 }
 
@@ -5432,16 +5200,12 @@ _VisualElementImpl::InvalidateRectangleI(const FloatRectangle* pRectangle)
 
        GetSharedData().invalidatedRegion = invRect;
 
-#ifdef OLD
-       InvalidateHierarchyProps(HIERARCHY_PROPERTY_CONTENT, false, false);
-#else
        _VisualElementImpl* pElement = this;
        while (pElement)
        {
                pElement->GetSharedData().childrenInvalidated = true;
                pElement = pElement->GetParent();
        }
-#endif
        SetRootNeedsContentUpdate();
 
        return E_SUCCESS;
@@ -5502,11 +5266,7 @@ _VisualElementImpl::Draw(void)
 //     if (IS_PRESENTATION(this))
 //             __UpdateHierarchyProps();
 
-#ifdef OLD
-       if (unlikely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0))
-#else
        if (unlikely(GetSharedData().childrenInvalidated))
-#endif
        {
 //             if (unlikely(!IS_PRESENTATION(this)))
 //                     __UpdateHierarchyProps();
@@ -5551,20 +5311,12 @@ _VisualElementImpl::DrawForAnimation(void)
                return E_SUCCESS;
        }
 
-#ifdef OLD
-       if (unlikely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0))
-#else
        if (unlikely(GetSharedData().childrenInvalidated))
-#endif
        {
                _VisualElementImpl* pRenderTarget = GetRenderTarget();
                pRenderTarget->DrawRectangle(GetSharedData().invalidatedRegion);
 
-#ifdef OLD
-               if (likely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0))
-#else
                if (likely(GetSharedData().childrenInvalidated == false))
-#endif
                {
                        return E_SUCCESS;
                }
@@ -5575,22 +5327,14 @@ _VisualElementImpl::DrawForAnimation(void)
                for (int i = 0; i < count; i++)
                {
                        pChild = __children.GetChildAt(i);
-#ifdef OLD
-                       if (!pChild || (pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0)
-#else
                        if (!pChild || (pChild->GetSharedData().childrenInvalidated == false))
-#endif
                        {
                                continue;
                        }
 
                        pChild->DrawForAnimation();
 
-#ifdef OLD
-                       if ((pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0)
-#else
                        if ((pChild->GetSharedData().childrenInvalidated))
-#endif
                        {
                                childrenNeedUpdate = true;
                        }
@@ -5599,22 +5343,10 @@ _VisualElementImpl::DrawForAnimation(void)
                // update 'needUpdate' flag regarding children only if no invalidated-region
                if (GetSharedData().invalidatedRegion.IsEmpty())
                {
-#ifdef OLD
-                       SetPropsValidaty(HIERARCHY_PROPERTY_CONTENT, 0);
-                       if (childrenNeedUpdate)
-                       {
-                               __childrenNeedsUpdateProps |= HIERARCHY_PROPERTY_CONTENT;
-                       }
-                       else
-                       {
-                               __childrenNeedsUpdateProps &= ~HIERARCHY_PROPERTY_CONTENT;
-                       }
-#else
                        if (childrenNeedUpdate)
                        {
                                GetSharedData().childrenInvalidated = true;
                        }
-#endif
                }
        }
 
@@ -5624,11 +5356,7 @@ _VisualElementImpl::DrawForAnimation(void)
 void
 _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
 {
-#ifdef OLD
-       if (unlikely(!IsVisibleI()) || (__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0)
-#else
        if (unlikely(!IsVisibleI()) || GetSharedData().childrenInvalidated == false)
-#endif
        {
                return;
        }
@@ -5657,11 +5385,7 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
        // needUpdate flag may be 'true' after drawring invalidated region.
        // This means that some children still need to be updated !
        //
-#ifdef OLD
-       if (likely((__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0))
-#else
        if (likely(GetSharedData().childrenInvalidated == false))
-#endif
        {
                return;
        }
@@ -5682,11 +5406,7 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
        for (int i = 0; i < count; i++)
        {
                pChild = __children.GetChildAt(i);
-#ifdef OLD
-               if (!pChild || (pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) == 0)
-#else
                if (!pChild || pChild->GetSharedData().childrenInvalidated == false)
-#endif
                {
                        continue;
                }
@@ -5712,11 +5432,7 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
                                pChild->DrawRectangleIfNeeded(updateRect);
                }
 
-#ifdef OLD
-               if ((pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0)
-#else
                if (pChild->GetSharedData().childrenInvalidated)
-#endif
                {
                        childrenNeedUpdate = true;
                }
@@ -5725,22 +5441,10 @@ _VisualElementImpl::DrawRectangleIfNeeded(const FloatRectangle& drawRect)
        // update 'needUpdate' flag regarding children only if no invalidated-region
        if (GetSharedData().invalidatedRegion.IsEmpty())
        {
-#ifdef OLD
-                       SetPropsValidaty(HIERARCHY_PROPERTY_CONTENT, 0);
-                       if (childrenNeedUpdate)
-                       {
-                               __childrenNeedsUpdateProps |= HIERARCHY_PROPERTY_CONTENT;
-                       }
-                       else
-                       {
-                               __childrenNeedsUpdateProps &= ~HIERARCHY_PROPERTY_CONTENT;
-                       }
-#else
-                       if (childrenNeedUpdate)
-                       {
-                               GetSharedData().childrenInvalidated = true;
-                       }
-#endif
+               if (childrenNeedUpdate)
+               {
+                       GetSharedData().childrenInvalidated = true;
+               }
        }
 }
 
@@ -5811,13 +5515,7 @@ _VisualElementImpl::DrawRectangle(const FloatRectangle& drawRect)
                //      Clear *BEFORE* drawing because 'OnDraw' may add invalidated regions...
                //
                GetSharedData().invalidatedRegion.SetBounds(0.0f, 0.0f, 0.0f, 0.0f); // SetEmpty()
-
-#ifdef OLD
-               SetPropsValidaty(HIERARCHY_PROPERTY_CONTENT, 0);
-               __childrenNeedsUpdateProps &= ~HIERARCHY_PROPERTY_CONTENT;
-#else
                GetSharedData().childrenInvalidated = false;
-#endif
        }
 
 
@@ -5883,11 +5581,7 @@ _VisualElementImpl::DrawRectangle(const FloatRectangle& drawRect)
                                pChild->DrawRectangle(drawRectVisible);
                }
 
-#ifdef OLD
-               if ((pChild->__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT) != 0)
-#else
                if (pChild->GetSharedData().childrenInvalidated)
-#endif
                {
                        childrenNeedUpdate = true;
                }
@@ -5899,11 +5593,7 @@ _VisualElementImpl::DrawRectangle(const FloatRectangle& drawRect)
        //
        if (childrenNeedUpdate)
        {
-#ifdef OLD
-               __childrenNeedsUpdateProps |= HIERARCHY_PROPERTY_CONTENT;
-#else
                GetSharedData().childrenInvalidated = true;
-#endif
        }
 }
 
index 0328ef9..6397970 100644 (file)
@@ -97,7 +97,15 @@ SplitPanel::SetPane(Control* pControl, SplitPanelPaneOrder paneOrder)
        _SplitPanelImpl* pSplitPanelImpl = _SplitPanelImpl::GetInstance(*this);
        SysAssertf(pSplitPanelImpl != null, "Not yet constructed. Construct() should be called before use.");
 
-       return pSplitPanelImpl->SetPane(const_cast <_ControlImpl*>(_ControlImpl::GetInstance(*pControl)), paneOrder);
+       if (pControl ==  null)
+       {
+               return pSplitPanelImpl->SetPane(null, paneOrder);
+       }
+
+       _ControlImpl* pImpl = _ControlImpl::GetInstance(*pControl);
+       SysAssertf(pImpl != null, "Parameter pControl is not yet constructed. Construct() should be called before use.");
+
+       return pSplitPanelImpl->SetPane(pImpl, paneOrder);
 }
 
 Control*
index 8111d25..7bb2a8e 100644 (file)
@@ -52,7 +52,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
@@ -813,41 +813,41 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
 {
        result r = E_SUCCESS;
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundNormalEffectBitmap);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundPressedEffectBitmap);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopNormalEffectBitmap);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopPressedEffectBitmap);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleNormalEffectBitmap);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddlePressedEffectBitmap);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
-
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomNormalEffectBitmap);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomPressedEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundNormalEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_SINGLE_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundPressedEffectBitmap);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopNormalEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_TOP_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopPressedEffectBitmap);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleNormalEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_MIDDLE_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddlePressedEffectBitmap);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomNormalEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::GROUPED_BOTTOM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomPressedEffectBitmap);
 
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
index 222dcc8..82d882d 100644 (file)
@@ -990,11 +990,6 @@ _ContextMenuGridPresenter::AdjustItemLayoutTabStyle(void)
        layoutSize.width = maxWidth - __itemGap;
        layoutSize.height = lineCount * __itemHeight + (lineCount - 1) *__itemGap;
 
-       if (lineCount == 1)
-       {
-               return layoutSize;
-       }
-
        // divide margin
        int itemIndex = 0;
        for (int line = 0; line < lineCount; line++)
@@ -1275,7 +1270,6 @@ _ContextMenuGridPresenter::DrawItem(Tizen::Graphics::Canvas* pCanvas)
                }
 
                FloatRectangle rect = pItem->GetDrawRect();
-
                // divder
                bool drawDivider = pItem->HasLowerDivider();
                if (drawDivider == true)
@@ -1464,6 +1458,7 @@ _ContextMenuGridPresenter::OnTouchReleased(const _Control& source, const _TouchI
 
                if (pActionEvent == null)
                {
+                       __pContextMenu->SetVisibleState(false);
                        return true;
                }
 
@@ -1474,12 +1469,12 @@ _ContextMenuGridPresenter::OnTouchReleased(const _Control& source, const _TouchI
                {
                        __selectedIndex = -1;
                        __pressedIndex = -1;
+                       __pContextMenu->SetVisibleState(false);
                        return true;
                }
 
                __selectedIndex = -1;
                __pressedIndex = -1;
-               __pContextMenu->SetVisibleState(false);
 
                int actionId = pItem->GetActionId();
 
@@ -1487,10 +1482,12 @@ _ContextMenuGridPresenter::OnTouchReleased(const _Control& source, const _TouchI
 
                if (pEventArg == null)
                {
+                       __pContextMenu->SetVisibleState(false);
                        return true;
                }
 
                PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP);
+               __pContextMenu->SetVisibleState(false);
                pActionEvent->Fire(*pEventArg);
        }
 
index b837775..ed4a8cf 100644 (file)
 #include "FUi_AccessibilityContainer.h"
 #include "FUi_AccessibilityElement.h"
 #include "FUi_CoordinateSystemUtils.h"
+#include "FUi_Math.h"
 #include "FUi_ResourceManager.h"
 
+#include "FUiCtrl_ScrollPanel.h"
 #include "FUiCtrl_ContextMenuItem.h"
 
 using namespace Tizen::Base;
@@ -369,16 +371,6 @@ _ContextMenuItem::DrawItemBackground(void)
 
        SetBackgroundColor(Color(0, 0, 0, 0));
 
-       if (!__upperDividerLine)
-       {
-               topMargin = __bgPressedMargin;
-       }
-
-       if (!__lowerDividerLine)
-       {
-               bottomMargin = __bgPressedMargin;
-       }
-
        if (__pBackgroundLabel == null)
        {
                __pBackgroundLabel = _Label::CreateLabelN();
@@ -396,7 +388,31 @@ _ContextMenuItem::DrawItemBackground(void)
        }
 
        FloatRectangle bounds = GetBoundsF();
+       _ScrollPanel* pScrollPanel = static_cast<_ScrollPanel*>(GetParent());
+       FloatRectangle boundsScrollPanel = pScrollPanel->GetBoundsF();
+
+       float topOverlap = pScrollPanel->GetScrollPosition() - bounds.y;
+       if (topOverlap > 0.0f)
+       {
+               topMargin = topOverlap + __bgPressedMargin;
+       }
+       else if (!__upperDividerLine)
+       {
+               topMargin = __bgPressedMargin;
+       }
+
+       float bottomOverlap = bounds.y + bounds.height - (pScrollPanel->GetScrollPosition() + boundsScrollPanel.height);
+       if (bottomOverlap > 0.0f) 
+       {
+               bottomMargin = bottomOverlap + __bgPressedMargin;
+       }
+       else if (!__lowerDividerLine)
+       {
+               bottomMargin = __bgPressedMargin;
+       }
+
        __pBackgroundLabel->SetBounds(FloatRectangle(__bgPressedMargin, topMargin, bounds.width - __bgPressedMargin * 2.0f, bounds.height - topMargin - bottomMargin));
+
        Bitmap* BgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pMagentaBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), color);
        SysTryReturnVoidResult(NID_UI_CTRL, BgBitmap, E_OUT_OF_MEMORY, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
index aef3090..2f9e913 100644 (file)
@@ -669,7 +669,7 @@ _DateTimeBar::OnAccessibilityReadingElement(const _AccessibilityContainer& contr
 }
 
 bool
-_DateTimeBar::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_DateTimeBar::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }
index 765de9f..346d4ae 100644 (file)
@@ -238,6 +238,7 @@ _Edit::_Edit(void)
        , __internalFocus(false)
        , __isDestroyed(false)
        , __pTextFilter(null)
+       , __previousBounds()
 {
        for (int status = 0; status < EDIT_COLOR_MAX; status++)
        {
@@ -595,70 +596,31 @@ _Edit::GetContentSizeInternalF(void) const
        FloatRectangle previousRect = pTextObject->GetBoundsF();
        FloatRectangle newRect = previousRect;
 
-       bool fitToHorizontal = false;
-       bool fitToVertical = true;
-
-       if (fitToHorizontal)
+       if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
        {
-               if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
-               {
-                       newRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width;
-               }
-               else
-               {
-                       newRect.width = _ControlManager::GetInstance()->GetScreenSizeF().height;
-               }
-               newRect.width -= (GetBoundsF().x + leftMargin + rightMargin);
+               newRect.height = _ControlManager::GetInstance()->GetScreenSizeF().height;
        }
-       if (fitToVertical)
+       else
        {
-               if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
-               {
-                       newRect.height = _ControlManager::GetInstance()->GetScreenSizeF().height;
-               }
-               else
-               {
-                       newRect.height = _ControlManager::GetInstance()->GetScreenSizeF().width;
-               }
-               newRect.height -= (GetBoundsF().y + textTopMargin + textBottomMargin);
+               newRect.height = _ControlManager::GetInstance()->GetScreenSizeF().width;
        }
+       newRect.height -= (GetBoundsF().y + textTopMargin + textBottomMargin);
 
        pTextObject->SetBounds(newRect);
        pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
        pTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_WORD);
        pTextObject->Compose();
 
-       if (fitToHorizontal && fitToVertical)
-       {
-               dimension = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength());
-               float height = pTextObject->GetTotalHeightF();
-               if (height < newRect.height)
-               {
-                       dimension.height = height;
-               }
-               else
-               {
-                       dimension.height = newRect.height;
-               }
-       }
-       else if (fitToHorizontal)
+       float height = pTextObject->GetTotalHeightF();
+       if (height < newRect.height)
        {
-               dimension = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength());
-               dimension.height = GetBoundsF().height;
+               dimension.height = height;
        }
-       else if (fitToVertical)
+       else
        {
-               float height = pTextObject->GetTotalHeightF();
-               if (height < newRect.height)
-               {
-                       dimension.height = height;
-               }
-               else
-               {
-                       dimension.height = newRect.height;
-               }
-               dimension.width = newRect.width;
+               dimension.height = newRect.height;
        }
+       dimension.width = newRect.width;
 
        // restore
        pTextObject->SetBounds(previousRect);
@@ -666,14 +628,7 @@ _Edit::GetContentSizeInternalF(void) const
        pTextObject->SetWrap(previousWrapType);
        pTextObject->Compose();
 
-       if (fitToHorizontal)
-       {
-               dimension.width += leftMargin + rightMargin + textLeftMargin + textRightMargin;
-       }
-       if (fitToVertical)
-       {
-               dimension.height += textTopMargin + textBottomMargin;
-       }
+       dimension.height += textTopMargin + textBottomMargin;
 
        return  dimension;
 }
@@ -2011,7 +1966,19 @@ _Edit::OnBoundsChanged(void)
                        if (_pEditPresenter->IsUpdateInitialBounds())
                        {
                                FloatRectangle editBounds = GetBoundsF();
-                               _pEditPresenter->SetControlInitialBounds(editBounds);
+                               if (__previousBounds.height != editBounds.height || __previousBounds.width != editBounds.width)
+                               {
+                                       _pEditPresenter->SetControlInitialBounds(editBounds);
+                               }
+                               else
+                               {
+                                       _pEditPresenter->SetControlInitialPosition(FloatPoint(editBounds.x, editBounds.y));
+                               }
+                               __previousBounds = editBounds;
+                       }
+                       else
+                       {
+                               __previousBounds = GetBoundsF();
                        }
                }
 
@@ -2221,51 +2188,51 @@ _Edit::LoadDefaultBackgroundBitmap(GroupStyle groupStyle)
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
                        break;
                case GROUP_STYLE_SINGLE:
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
                        break;
                case GROUP_STYLE_TOP:
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
                        break;
                case GROUP_STYLE_MIDDLE:
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
                        break;
                case GROUP_STYLE_BOTTOM:
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
-                       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
+                       r = GET_BITMAP_CONFIG_N(EDIT::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap");
                        break;
                default:
index 1db2c16..e5dc76f 100644 (file)
@@ -141,7 +141,6 @@ _EditDatePresenter::Initialize(void)
 {
        result r = E_SUCCESS;
        float editDateHeight = 0.0f;
-       float editDateWidth = 0.0f;
        float dateLeftMargin = 0.0f;
        float titleLeftMargin = 0.0f;
        float titledateMargin = 0.0f;
@@ -151,7 +150,6 @@ _EditDatePresenter::Initialize(void)
        float dayElementMinWidth = 0.0f;
        FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f);
 
-       GET_SHAPE_CONFIG(EDITDATE::WIDTH, __pEditDate->GetOrientation(), editDateWidth);
        GET_SHAPE_CONFIG(EDITDATE::HEIGHT, __pEditDate->GetOrientation(), editDateHeight);
        GET_SHAPE_CONFIG(EDITDATE::TITLE_TEXT_LEFT_MARGIN, __pEditDate->GetOrientation(), titleLeftMargin);
        GET_SHAPE_CONFIG(EDITDATE::ITEM_DIVIDER_HEIGHT, __pEditDate->GetOrientation(), __dividerLineHeight);
@@ -181,7 +179,7 @@ _EditDatePresenter::Initialize(void)
        {
                __titleBounds.x = titleLeftMargin;
                __titleBounds.y = (editDateHeight - (__titleBounds.height + titledateMargin + dateHeight)) / 2.0f;
-               __titleBounds.width = editDateWidth - __titleBounds.x;
+               __titleBounds.width = __pEditDate->GetBoundsF().width - __titleBounds.x;
 
                bounds.y = __titleBounds.y + __titleBounds.height + titledateMargin;
 
@@ -258,6 +256,7 @@ _EditDatePresenter::InitializeTitleObject(void)
        __titleObject.SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT | TEXT_OBJECT_ALIGNMENT_MIDDLE);
        __titleObject.SetWrap(TEXT_OBJECT_WRAP_TYPE_NONE);
        __titleObject.SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
+       __titleObject.SetTextObjectEllipsisType(TEXT_OBJECT_ELLIPSIS_TYPE_TAIL);
 
        return r;
 }
index 6e6aa8b..c3305e6 100644 (file)
@@ -102,6 +102,7 @@ bool _EditPresenter::__isClipboardExist = false;
 float _EditPresenter::__initialParentHeight = 0.0f;
 float _EditPresenter::__clipboardHeight = 0.0f;
 _EditFooterVisibleStatus _EditPresenter::__initialFooterVisibleStatus = EDIT_FOOTER_VISIBLE_STATUS_NONE;
+bool _EditPresenter::__footerVisibleChanged = false;
 
 _EditAnimationProvider::_EditAnimationProvider(void)
 {
@@ -308,7 +309,7 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
 
                if (__isInputConnectionBound && __isUSBKeyboardConnected) // hide callback from external condition(usb mode off->on), focus remaining
                {
-                       if (!__isKeypadCommandButtonVisible)
+                       if (!__isKeypadCommandButtonVisible && !__isClipboardExist)
                        {
                                SetFooterVisible(true);// must be called ahead of DeflateClientRectHeight
                        }
@@ -336,7 +337,7 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                {
                        if (__isInputConnectionBound)// keypad drag down
                        {
-                               if (!__isKeypadCommandButtonVisible)
+                               if (!__isKeypadCommandButtonVisible && !__isClipboardExist)
                                {
                                        SetFooterVisible(true);// must be called ahead of DeflateClientRectHeight
                                }
@@ -405,11 +406,12 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                }
                else
                {
+                       __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CLOSED);
+
                        if (!__isClipboardExist)
                        {
                                __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CLOSE);
                        }
-                       __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CLOSED);
                }
        }
 
@@ -983,7 +985,10 @@ _EditPresenter::OnClipboardPopupClosed(void)
 
                SysLog(NID_UI_CTRL, "[EDIT] clipboard closed! [KeypadExist:%d]keypad height = %f", __isKeypadExist, absKeypadBounds.height);
 
-               ChangeLayoutInternal(__pEdit->GetOrientation());
+               if (__isInputConnectionBound)
+               {
+                       ChangeLayoutInternal(__pEdit->GetOrientation());
+               }
 
                if (__isKeypadExist)
                {
@@ -999,6 +1004,11 @@ _EditPresenter::OnClipboardPopupClosed(void)
                }
                else
                {
+                       if (__footerVisibleChanged)
+                       {
+                               SetFooterVisible(true);
+                       }
+
                        AdjustParentPanelHeight(true);
                        if (__pParentForm)
                        {
@@ -1040,19 +1050,14 @@ _EditPresenter::Dispose(void)
 
        CheckUSBKeyboardStatus();
 
-       if (__clipboardConnected) //Edit control removed after FocusLost or without FocusLost callback.
+       if (__isInputConnectionBound || __isKeypadHiding || __clipboardConnected) //Edit control removed without FocusLost callback or HideKeypad.
        {
-               __pClipboard->HidePopup();
-               __isClipboardExist = false;
-
-               if (__pParentForm)
+               if (__clipboardConnected) //Edit control removed after FocusLost or without FocusLost callback.
                {
-                       __pParentForm->SetClipboardShowState(false);
+                       __pClipboard->HidePopup();
+                       __isClipboardExist = false;
                }
-       }
 
-       if (__isInputConnectionBound || __isKeypadHiding) //Edit control removed without FocusLost callback or HideKeypad.
-       {
                if (__pCommandButton && __isKeypadCommandButtonVisible)
                {
                        __pCommandButton->SetVisibleState(false);
@@ -1067,7 +1072,15 @@ _EditPresenter::Dispose(void)
                {
                        SysLog(NID_UI_CTRL, "[EDIT] Form deflate RESET!!!!!!!!!!");
                        __pParentForm->DeflateClientRectHeight(0.0f);
-                       __pParentForm->SetKeypadShowState(false);
+
+                       if (__clipboardConnected)
+                       {
+                               __pParentForm->SetClipboardShowState(false);
+                       }
+                       else
+                       {
+                               __pParentForm->SetKeypadShowState(false);
+                       }
 
                        if (__pParentForm->GetFooter())
                        {
@@ -1089,9 +1102,11 @@ _EditPresenter::Dispose(void)
                AdjustParentPanelHeight(true);
 
                __isKeypadExist = false;
-               __initialFooterVisibleStatus = EDIT_FOOTER_VISIBLE_STATUS_NONE;
        }
 
+       __initialFooterVisibleStatus = EDIT_FOOTER_VISIBLE_STATUS_NONE;
+       __footerVisibleChanged = false;
+
        if (__pParentForm)
        {
                if (__pParentForm->GetFooter())
@@ -3938,6 +3953,13 @@ _EditPresenter::OnTapGestureDetected(void)
                        cursorPos = 0;
                }
 
+               if (__isInputConnectionBound && __isTextComposing)
+               {
+                       __pInputConnection->FinishTextComposition();
+                       __isTextComposing = false;
+                       __composingTextLength = 0;
+               }
+
                GetWordPosition(cursorPos, start, end);
                SetBlockRange(start, end);
                ScrollPanelToCursorPosition();
@@ -3949,12 +3971,6 @@ _EditPresenter::OnTapGestureDetected(void)
                __pCopyPasteManager->Show();
                __isCopyPasteManagerExist = true;
 
-               if (__isInputConnectionBound && __isTextComposing)
-               {
-                       __pInputConnection->FinishTextComposition();
-                       __isTextComposing = false;
-                       __composingTextLength = 0;
-               }
                __pEdit->Draw();
        }
 
@@ -5404,6 +5420,13 @@ _EditPresenter::SetControlInitialBounds(FloatRectangle initBounds)
        __initialBounds = initBounds;
 }
 
+void
+_EditPresenter::SetControlInitialPosition(FloatPoint initPosition)
+{
+       __initialBounds.x = initPosition.x;
+       __initialBounds.y = initPosition.y;
+}
+
 bool
 _EditPresenter::IsUpdateInitialBounds(void)
 {
@@ -5573,6 +5596,7 @@ _EditPresenter::OnFocusLost(void)
                if (__pClipboard)
                {
                        __pClipboard->HidePopup();
+                       OnClipboardPopupClosed();
                }
        }
 
@@ -6111,10 +6135,12 @@ _EditPresenter::SetFooterVisible(bool isVisible)
                        if (isVisible)
                        {
                                SysLog(NID_UI_CTRL, "[EDIT] SetFooterVisible TRUE!!!!!");
+                               __footerVisibleChanged = false;
                        }
                        else
                        {
                                SysLog(NID_UI_CTRL, "[EDIT] SetFooterVisible FALSE!!!!!");
+                               __footerVisibleChanged = true;
                        }
 
                        pFooter->SetVisibleState(isVisible);
@@ -6352,17 +6378,17 @@ _EditPresenter::ShowKeypad(bool focus)
 
                __isKeypadExist = CheckKeypadExist(__pEdit->GetOrientation()); //prediction alreaedy exists
 
-               if (__initialFooterVisibleStatus == EDIT_FOOTER_VISIBLE_STATUS_NONE)
-               {
-                       CheckInitialFooterVisibleState();
-               }
-
                if (__isKeypadCommandButtonVisible)
                {
                        __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_CREATED);
                        __pEdit->AttachScrollPanelEvent();
                        __pEdit->SendScrollPanelEvent(CORE_OVERLAY_CONTROL_CREATED);
 
+                       if (__initialFooterVisibleStatus == EDIT_FOOTER_VISIBLE_STATUS_NONE)
+                       {
+                               CheckInitialFooterVisibleState();
+                       }
+
                        SetFooterVisible(false);
                        ChangeLayoutInternal(__pEdit->GetOrientation());
                        AdjustParentPanelHeight(false);
@@ -6372,6 +6398,11 @@ _EditPresenter::ShowKeypad(bool focus)
                }
                else
                {
+                       if (__initialFooterVisibleStatus == EDIT_FOOTER_VISIBLE_STATUS_NONE)
+                       {
+                               CheckInitialFooterVisibleState();
+                       }
+
                        if (__isKeypadExist)
                        {
                                ChangeLayoutInternal(__pEdit->GetOrientation());
@@ -6415,6 +6446,18 @@ _EditPresenter::ShowKeypad(bool focus)
                                CheckInitialFooterVisibleState();
                        }
                }
+               else
+               {
+                       if (__footerVisibleChanged)
+                       {
+                               SetFooterVisible(true);
+                       }
+
+                       if (__initialFooterVisibleStatus == EDIT_FOOTER_VISIBLE_STATUS_NONE)
+                       {
+                               CheckInitialFooterVisibleState();
+                       }
+               }
 
                if (__isKeypadCommandButtonVisible)
                {
@@ -6794,9 +6837,10 @@ _EditPresenter::HideKeypad(bool focus)
        if (__isUSBKeyboardConnected)
        {
                SysLog(NID_UI_CTRL, "[EDIT]HideKeypad called in USB ON mode!!!!");
-               SetFooterVisible(true);
                if (__pCommandButton && __isKeypadCommandButtonVisible)
                {
+                       SetFooterVisible(true);
+
                        __pCommandButton->SetVisibleState(false);
 
                        if (__pParentForm)
@@ -6818,6 +6862,7 @@ _EditPresenter::HideKeypad(bool focus)
                        if (!__isKeypadExist)
                        {
                                SetFooterVisible(true);//must be called ahead of DeflateClientRectHeights
+
                                if (__pParentForm)
                                {
                                        SysLog(NID_UI_CTRL, "[EDIT] Form deflate RESET!!!!!!!!!!");
@@ -6835,7 +6880,7 @@ _EditPresenter::HideKeypad(bool focus)
        __isTextComposing = false;
        __composingTextLength = 0;
 
-       if (__isKeypadExist && focus)
+       if (__isKeypadExist)
        {
                __isKeypadHiding = true;
        }
index fe45dab..9709d62 100644 (file)
@@ -927,7 +927,7 @@ _EditTime::OnAccessibilityReadingElement(const _AccessibilityContainer& control,
 }
 
 bool
-_EditTime::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_EditTime::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }
index 000106e..c59ae76 100644 (file)
@@ -428,10 +428,9 @@ void
 _EditTimePresenter::SetTitleBounds(void)
 {
        GET_SHAPE_CONFIG(EDITTIME::TITLE_TEXT_LEFT_MARGIN, __pEditTime->GetOrientation(), __titleBounds.x);
-       GET_SHAPE_CONFIG(EDITTIME::WIDTH, __pEditTime->GetOrientation(), __titleBounds.width);
        GET_SHAPE_CONFIG(EDITTIME::TITLE_HEIGHT, __pEditTime->GetOrientation(), __titleBounds.height);
 
-       __titleBounds.width = __titleBounds.width - __titleBounds.x;
+       __titleBounds.width = __pEditTime->GetBoundsF().width - __titleBounds.x;
        return;
 }
 
@@ -728,6 +727,7 @@ _EditTimePresenter::InitializeTitleObject(void)
        __titleObject.SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT | TEXT_OBJECT_ALIGNMENT_MIDDLE);
        __titleObject.SetWrap(TEXT_OBJECT_WRAP_TYPE_NONE);
        __titleObject.SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
+       __titleObject.SetTextObjectEllipsisType(TEXT_OBJECT_ELLIPSIS_TYPE_TAIL);
 
        return r;
 }
index c624625..9c7f7aa 100644 (file)
@@ -445,7 +445,7 @@ _FastScrollIndexView::GetOmissionIndexAtPoint(_FastScrollIndex* pIndex, const Fl
        float indexHeight = GetIndexHeight() / pIndex->GetChildCount();
        int omissionIndexOrder = 0;
 
-       if (!(_FloatCompare(touchY, 0.0f) || _FloatCompare(indexHeight, 0.0f)))
+       if ((touchY > 0.0f) && !_FloatCompare(indexHeight, 0.0f))
        {
                omissionIndexOrder = _CoordinateSystemUtils::ConvertToInteger(touchY / indexHeight);
        }
@@ -554,6 +554,11 @@ _FastScrollIndexView::GetSelectedIndex(void) const
 void
 _FastScrollIndexView::SetSelectedIndexInOmittedIndex(_FastScrollIndex* pIndex)
 {
+       if (pIndex == __pSelectedIndexInOmittedIndex)
+       {
+               return;
+       }
+
        __pFormerIndex = __pSelectedIndexInOmittedIndex;
        __pSelectedIndexInOmittedIndex = pIndex;
 }
@@ -2703,6 +2708,10 @@ _FastScrollPresenter::SelectOnIndexViews(const FloatPoint& point, bool animation
                        {
                                pSelectedIndex = pFocusedIndexView->GetOmissionIndexAtPoint(pIndex,
                                                                                FloatPoint(pFocusedIndexView->GetIndexBoundsF().x, point.y));
+                               if (pSelectedIndex == null)
+                               {
+                                       pSelectedIndex = pFocusedIndexView->GetSelectedIndexInOmittedIndex();
+                               }
                        }
                        pFocusedIndexView->SetSelectedIndexInOmittedIndex(pSelectedIndex);
 
@@ -2711,6 +2720,10 @@ _FastScrollPresenter::SelectOnIndexViews(const FloatPoint& point, bool animation
                else
                {
                        pSelectedIndex = pFocusedIndexView->GetSelectedIndex();
+                       if (pSelectedIndex && pSelectedIndex->GetOmitted() == true)
+                       {
+                               pSelectedIndex = pFocusedIndexView->GetSelectedIndexInOmittedIndex();
+                       }
                        selectedIndexLevel = __focusedIndexLevel;
                }
        }
index ea8b1c6..6b7c56a 100644 (file)
@@ -40,6 +40,11 @@ using namespace Tizen::Graphics;
 using namespace Tizen::System;
 using namespace Tizen::Ui::Effects;
 
+namespace {
+       const float TOUCH_INSENSITIVE = 0.08f;
+       const int GALLERY_GESTURE_TAP_MOVE_ALLOWANCE = 50;
+} // unnamed namespace
+
 namespace Tizen { namespace Ui { namespace Controls {
 
 _Gallery::_Gallery(void)
@@ -186,6 +191,9 @@ _Gallery::Construct(_GalleryItemProviderAdaptorImpl* pGalleryItemProviderAdaptor
        r = _Control::AddGestureDetector(__twoTapGesture);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
+       r = __twoTapGesture.SetMoveAllowance(GALLERY_GESTURE_TAP_MOVE_ALLOWANCE);
+       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Failed to set TapMoveAllowance", GetErrorMessage(r));
+
        __oneTapGesture.StartOnFailureOf(__twoTapGesture);
 
        SetMultiTouchEnabled(true);
@@ -198,6 +206,8 @@ _Gallery::Construct(_GalleryItemProviderAdaptorImpl* pGalleryItemProviderAdaptor
        r = _SettingInfoImpl::AddSettingEventListenerForInternal(*this);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
+       SetTouchPressThreshold(TOUCH_INSENSITIVE);
+
        SetRenderer((_GalleryRenderer &)*pRenderer);
        SetPresenter((_GalleryPresenter &)*pPresenter);
 
index 7e39ee4..05e7164 100644 (file)
@@ -1895,9 +1895,9 @@ _GroupedListViewImpl::OnDraw(void)
 void
 _GroupedListViewImpl::OnChangeLayout(_ControlOrientation orientation)
 {
-       _ControlImpl::OnChangeLayout(orientation);
-
        __isOrientationChanged = true;
+
+       _ControlImpl::OnChangeLayout(orientation);
 }
 
 void
index 7f5c7be..f935d6c 100644 (file)
@@ -292,13 +292,13 @@ _Indicator::AddIndicatorObject(_Form* pForm)
                rotation = 0;
                break;
        case ORIENTATION_STATUS_LANDSCAPE :
-               rotation = 90;
+               rotation = 270;
                break;
        case ORIENTATION_STATUS_PORTRAIT_REVERSE :
                rotation = 180;
                break;
        case ORIENTATION_STATUS_LANDSCAPE_REVERSE :
-               rotation = 270;
+               rotation = 90;
                break;
        default :
                break;
index 23e181e..afbdd2f 100644 (file)
@@ -567,7 +567,15 @@ _Label::GetContentSizeInternalF(void) const
        pTextObject->Compose();
        dimension = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength());
 
-       contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width;
+       _ControlOrientation orientation = GetOrientation();
+       if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
+       {
+               contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width;
+       }
+       else
+       {
+               contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().height;
+       }
 
        if (dimension.width > contentRect.width - GetBoundsF().x - __leftMargin * 2)
        {
index 7b3ca24..2f03051 100644 (file)
@@ -1758,9 +1758,9 @@ _ListViewImpl::OnDraw(void)
 void
 _ListViewImpl::OnChangeLayout(_ControlOrientation orientation)
 {
-       _ControlImpl::OnChangeLayout(orientation);
-
        __isOrientationChanged = true;
+
+       _ControlImpl::OnChangeLayout(orientation);
 }
 
 void
index 018462e..cc6c2b4 100644 (file)
@@ -167,8 +167,10 @@ _ListViewModel::GetItemFromTemporaryBuffer(int groupIndex, int itemIndex)
 _IListItemCommon*
 _ListViewModel::GetItemFromContainer(int groupIndex, int itemIndex) const
 {
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), null, E_INVALID_ARG,
-                               "[E_INVALID_ARG] The group index is not valid.");
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return null;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, null, GetLastResult(),
@@ -210,8 +212,10 @@ _ListViewModel::LoadItem(int groupIndex, int itemIndex)
        }
 
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), null, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index.(%d)", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return null;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, null, GetLastResult(),
@@ -220,7 +224,6 @@ _ListViewModel::LoadItem(int groupIndex, int itemIndex)
        // check validation of item index
        if (itemIndex < -1 || itemIndex >= pListGroupNode->__itemCountInGroup)
        {
-               SysLogException(NID_UI_CTRL, E_INVALID_ARG, "[E_INVALID_ARG] The item index is not valid.");
                return null;
        }
 
@@ -358,16 +361,20 @@ bool
 _ListViewModel::IsValidItem(int groupIndex, int itemIndex) const
 {
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index(%d).", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return false;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, false, GetLastResult(),
                                 "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        // check validation of item index
-       SysTryReturn(NID_UI_CTRL, (itemIndex >= -1 && itemIndex < pListGroupNode->__itemCountInGroup), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong item index(%d).", itemIndex);
+       if (itemIndex < -1 || itemIndex >= pListGroupNode->__itemCountInGroup)
+       {
+               return false;
+       }
 
        return true;
 }
@@ -376,16 +383,20 @@ bool
 _ListViewModel::IsLoadedItem(int groupIndex, int itemIndex) const
 {
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index(%d).", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return false;
+       }
 
        _ListViewGroupNode* pListGroupNode = GetGroupNode(groupIndex);
        SysTryReturn(NID_UI_CTRL, pListGroupNode != null, false, GetLastResult(),
                                 "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        // check validation of item index
-       SysTryReturn(NID_UI_CTRL, (itemIndex < pListGroupNode->__itemCountInGroup), false, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong item index(%d).", itemIndex);
+       if (itemIndex < -1 || itemIndex >= pListGroupNode->__itemCountInGroup)
+       {
+               return false;
+       }
 
        int temporaryGroupIndex = -1;
        int temporaryItemIndex = -1;
@@ -954,8 +965,10 @@ int
 _ListViewModel::GetItemCountInGroup(int groupIndex) const
 {
        // check validation of groupIndex
-       SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __countOfAllGroups), -1, E_INVALID_ARG,
-                               "[E_INVALID_ARG] Wrong group index(%d).", groupIndex);
+       if (groupIndex < 0 || groupIndex >= __countOfAllGroups)
+       {
+               return -1;
+       }
 
        int itemCount = -1;
 
index f76d18e..5bf1137 100644 (file)
@@ -274,7 +274,9 @@ _MessageBoxPresenter::Initialize(_MessageBox& msgbox)
                __pTitleTextObject = new (std::nothrow) TextObject();
                SysTryReturn(NID_UI_CTRL, __pTitleTextObject != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Unable to create TitleTextObject.");
 
-               __pTitleTextObject->Construct();
+               r = __pTitleTextObject->Construct();
+               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
                FloatRectangle bounds = FloatRectangle(titleLeftMargin + transLeftMargin,
                                                                                        titleTopMargin + transTopMargin,
                                                                                        defaultWidth - (titleLeftMargin + titleRightMargin + transLeftMargin + transRightMargin),
@@ -310,7 +312,10 @@ _MessageBoxPresenter::Initialize(_MessageBox& msgbox)
 
        __pBodyTextObject = new (std::nothrow) TextObject();
        SysTryCatch(NID_UI_CTRL, __pBodyTextObject != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
-       __pBodyTextObject->Construct();
+
+       r = __pBodyTextObject->Construct();
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
        labelHeight = GetLabelHeight(__pBodyTextObject, const_cast <wchar_t*>(__pMessageBox->GetText().GetPointer()),
                                                                __pMessageBox->GetText().GetLength(), bodyTextSize, __textBounds);
 
@@ -367,8 +372,6 @@ _MessageBoxPresenter::GetLabelHeight(TextObject* textObject, wchar_t* text, int
        result r = SetFontInfo(FONT_STYLE_PLAIN, bodyTextSize);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to set font.", GetErrorMessage(r));
 
-       textObject->Construct();
-
        pSimpleTextForBodyText = new (std::nothrow) TextSimple(text, length, TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
        SysTryCatch(NID_UI_CTRL, pSimpleTextForBodyText != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
index dd4f794..be1f19e 100644 (file)
@@ -360,6 +360,8 @@ _OptionMenu::ShowSubMenu(int mainIndex, _OptionMenuItem& item)
                        CONTEXT_MENU_CORE_STYLE_LIST,
                        CONTEXT_MENU_CORE_ALIGN_UP);
 
+        __pSubMenu->SetFocusable(true);
+
        if (__pSubMenu == null)
        {
                return GetLastResult();
@@ -402,7 +404,6 @@ _OptionMenu::ShowSubMenu(int mainIndex, _OptionMenuItem& item)
        }
 
        __pSubMenu->Open();
-       SetTouchCapture(false, false);
        __subMenuIndex = mainIndex;
 
        return E_SUCCESS;
@@ -468,8 +469,17 @@ _OptionMenu::OnAttachingToMainTree(const _Control* pParent)
 result
 _OptionMenu::OnAttachedToMainTree(void)
 {
+       if (__pOptionMenuPresenter != null)
+       {
+               __pOptionMenuPresenter->CalculateBounds();
+
+               __pOptionMenuPresenter->PrepareAnimation();
+               __pOptionMenuPresenter->SetOptionMenuVisibility(true);
+       }
+
        __pOptionMenuPresenter->OnAttachedToMainTree();
-       return E_SUCCESS;
+
+       return _Window::OnAttachedToMainTree();
 }
 
 result
@@ -491,8 +501,6 @@ _OptionMenu::OnVisibleStateChanged(void)
 void
 _OptionMenu::OnActivated(void)
 {
-       _Window::OnActivated();
-
        if (GetOwner() != null)
        {
                ChangeLayout(GetOwner()->GetOrientation());
@@ -502,15 +510,9 @@ _OptionMenu::OnActivated(void)
                ChangeLayout(_ControlManager::GetInstance()->GetOrientation());
        }
 
-       if (__pOptionMenuPresenter != null)
-       {
-               __pOptionMenuPresenter->CalculateBounds();
-
-               __pOptionMenuPresenter->PrepareAnimation();
-               __pOptionMenuPresenter->SetOptionMenuVisibility(true);
-       }
+       SetTouchCapture(true, false);
 
-       SetTouchCapture(false, false);
+       _Window::OnActivated();
 }
 
 void
index 857530a..10ece50 100644 (file)
@@ -143,7 +143,7 @@ _OptionMenuPresenter::_OptionMenuPresenter(_OptionMenu* optionMenu)
        , __selectedIndex(-1)
        , __isHandlerPressed(false)
        , __isClosing(false)
-       , __isAnimationStarted(true)
+       , __isAnimationStarted(false)
        , __pOptionMenuVE(null)
        , __pThirtyThreeTimingFunction(null)
        , __pSixtyTimingFunction(null)
@@ -1377,6 +1377,8 @@ _OptionMenuPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& t
                return false;
        }
 
+       SysTryReturn(NID_UI_CTRL, (!__isAnimationStarted), false, E_SUCCESS, "[E_SUCCESS] Animation     is in Progress.");
+
        if (__pOptionMenu->IsSubMenuShown() == true)
        {
                __pOptionMenu->DestroySubMenu();
index d55da98..e852a4e 100644 (file)
 #include <new>
 #include <sys/shm.h>
 #include <unique_ptr.h>
-
-#define OVERLAY_PIXMAP_DUMP 0
-
-#if OVERLAY_PIXMAP_DUMP
-extern "C"{
-#include <stdio.h>
-#include <stdlib.h>
-#include <X11/Xproto.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <dri2.h>
-#include <tbm_bufmgr.h>
-#include <xf86drm.h>
-}
-#endif //OVERLAY_PIXMAP_DUMP
-
 #include <Ecore_Evas.h>
 
 #include <FBaseResult.h>
@@ -79,197 +62,6 @@ const int _ROTATION_180 = 180;
 const int _ROTATION_270 = 270;
 const int _ROTATION_360 = 360;
 
-#if OVERLAY_PIXMAP_DUMP
-
-tbm_bufmgr gTbmBufmgr = null;
-int gFileCount = 0;
-int gDrmFd = -1;
-
-void
-dump_bmp(const char* pFileName, const void* pData, int width, int height)
-{
-       FILE* pFile = null;
-
-       struct
-       {
-               unsigned char magic[2];
-       } bmpfile_magic = { {'B', 'M'} };
-
-       struct
-       {
-               unsigned int filesz;
-               unsigned short creator1;
-               unsigned short creator2;
-               unsigned int bmp_offset;
-       } bmpfile_header = { 0, 0, 0, 0x36 };
-
-       struct
-       {
-               unsigned int header_sz;
-               unsigned int width;
-               unsigned int height;
-               unsigned short nplanes;
-               unsigned short bitspp;
-               unsigned int compress_type;
-               unsigned int bmp_bytesz;
-               unsigned int hres;
-               unsigned int vres;
-               unsigned int ncolors;
-               unsigned int nimpcolors;
-       } bmp_dib_v3_header_t = { 0x28, 0, 0, 1, 24, 0, 0, 0, 0, 0, 0 };
-
-       if (pFileName != null)
-       {
-               pFile = fopen(pFileName, "w+");
-       }
-
-       if (pFile == null)
-       {
-               SysSecureLog(NID_UI_CTRL,"Failed to open %s", pFileName);
-               return;
-       }
-
-       bmpfile_header.filesz = sizeof(bmpfile_magic) + sizeof(bmpfile_header) + sizeof(bmp_dib_v3_header_t) + width * height * 3;
-       bmp_dib_v3_header_t.header_sz = sizeof(bmp_dib_v3_header_t);
-       bmp_dib_v3_header_t.width = width;
-       bmp_dib_v3_header_t.height = -height;
-       bmp_dib_v3_header_t.nplanes = 1;
-       bmp_dib_v3_header_t.bmp_bytesz = width * height * 3;
-
-       fwrite(&bmpfile_magic, sizeof(bmpfile_magic), 1, pFile);
-       fwrite(&bmpfile_header, sizeof(bmpfile_header), 1, pFile);
-       fwrite(&bmp_dib_v3_header_t, sizeof(bmp_dib_v3_header_t), 1, pFile);
-
-       unsigned int* pBlocks = (unsigned int*)pData;
-
-       for (int i = 0; i < (height * width); i++)
-       {
-               fwrite(&pBlocks[i], 3, 1, pFile);
-       }
-       fclose(pFile);
-
-       return;
-}
-
-tbm_bufmgr
-bufmgr_get(Display* pDisplay, Pixmap pixmap)
-{
-       int screen = DefaultScreen(pDisplay);
-
-       // DRI2
-       int eventBase = 0;
-       int errorBase = 0;
-       if (!DRI2QueryExtension(pDisplay, &eventBase, &errorBase))
-       {
-               SysSecureLog(NID_UI_CTRL, "Failed to get value of DRI2QueryExtension.");
-               return null;
-       }
-
-       int dri2Major = 0;
-       int dri2Minor = 0;
-       if (!DRI2QueryVersion(pDisplay, &dri2Major, &dri2Minor))
-       {
-               SysSecureLog(NID_UI_CTRL, "Failed to get value of DRI2QueryVersion.");
-               return null;
-       }
-
-       char* pDriverName = null;
-       char* pDeviceName = null;
-       if (!DRI2Connect(pDisplay, RootWindow(pDisplay, screen), &pDriverName, &pDeviceName))
-       {
-               SysSecureLog(NID_UI_CTRL, "Failed to get value of DRI2Connect.");
-               return null;
-       }
-
-       SysSecureLog(NID_UI_CTRL, "The current name of open drm device is %s.", pDeviceName);
-
-       // Get the drm_fd though opening the deviceName
-       gDrmFd = open(pDeviceName, O_RDWR);
-       if (gDrmFd < 0)
-       {
-               SysSecureLog(NID_UI_CTRL, "Failed to open drm device (%s)", pDeviceName);
-               return null;
-       }
-
-       // Get the drm magic
-       drm_magic_t magic;
-       drmGetMagic(gDrmFd, &magic);
-       if (!DRI2Authenticate(pDisplay, RootWindow(pDisplay, screen), magic))
-       {
-               SysSecureLog(NID_UI_CTRL, "Failed to get value of DRI2Authenticate.");
-               close(gDrmFd);
-               gDrmFd = -1;
-               return null;
-       }
-
-       // tbm buffer manager init
-       tbm_bufmgr bufmgr = tbm_bufmgr_init(gDrmFd);
-       if (!bufmgr)
-       {
-               SysSecureLog(NID_UI_CTRL, "Failed to initialize buffer manager.");
-               close(gDrmFd);
-               gDrmFd = -1;
-               return null;
-       }
-
-       DRI2CreateDrawable(pDisplay, pixmap);
-
-       return bufmgr;
-}
-
-static void
-pixmap_update (Display* pDisplay, tbm_bufmgr bufmgr, Pixmap pixmap, int x, int y, int width, int height)
-{
-       int dri2_width = 0;
-       int dri2_height = 0;
-       unsigned int attachments[1] = { DRI2BufferFrontLeft };
-       int dri2_count = 1;
-       int dri2_out_count = 0;
-
-       int opt = TBM_OPTION_READ|TBM_OPTION_WRITE;
-       char imgFile[100] = {0,};
-
-       tbm_bo bo;
-       tbm_bo_handle bo_handle;
-
-       DRI2Buffer* pDri2_buffers = DRI2GetBuffers (pDisplay, pixmap, &dri2_width, &dri2_height, attachments, dri2_count, &dri2_out_count);
-       SysTryLogCatch(NID_UI_CTRL, pDri2_buffers != null, , "Failed to get buffers.");
-       SysTryLogCatch(NID_UI_CTRL, pDri2_buffers[0].name != null, , "Failed to get a handle of the dri2 buffer.");
-
-       SysSecureLog(NID_UI_CTRL, "The current name of Dri2_buffers[0] is %d.", pDri2_buffers[0].name);
-
-       bo = tbm_bo_import(bufmgr, pDri2_buffers[0].name);
-       SysTryLogCatch(NID_UI_CTRL, bo != null, , "Failed to import bo (key : %d).", pDri2_buffers[0].name);
-
-       bo_handle = tbm_bo_map(bo, TBM_DEVICE_CPU, opt);
-       SysTryLogCatch(NID_UI_CTRL, bo_handle.ptr != null, , "Failed to get map.");
-
-       memset(imgFile, 0, sizeof(imgFile));
-       sprintf(imgFile,"./dump%d.bmp", gFileCount++);
-
-       if (gFileCount == 5 || gFileCount == 20)
-       {
-               dump_bmp(imgFile, bo_handle.ptr, dri2_width, dri2_height);
-       }
-
-CATCH:
-       if (bo_handle.ptr)
-       {
-               tbm_bo_unmap(bo);
-       }
-
-       if (bo)
-       {
-               tbm_bo_unref(bo);
-       }
-
-       if (pDri2_buffers)
-       {
-               free(pDri2_buffers);
-       }
-}
-#endif // OVERLAY_PIXMAP_DUMP
-
 bool
 _CheckXvExtension(Display* pDisplay, int* pFirstPort, int* pCountPort)
 {
@@ -299,15 +91,6 @@ _CheckXvExtension(Display* pDisplay, int* pFirstPort, int* pCountPort)
                return false;
        }
 
-//     SysLog(NID_UI_CTRL, "========================================");
-//     SysLog(NID_UI_CTRL, "XvQueryExtension returned the following:");
-//     SysLog(NID_UI_CTRL, "version      : %u", version);
-//     SysLog(NID_UI_CTRL, "release      : %u", release);
-//     SysLog(NID_UI_CTRL, "request_base : %u", requestBase);
-//     SysLog(NID_UI_CTRL, "event_base   : %u", eventBase);
-//     SysLog(NID_UI_CTRL, "error_base   : %u", errorBase);
-//     SysLog(NID_UI_CTRL, "========================================");
-
        unsigned int adaptors = 0;
        XvAdaptorInfo* pAdaptorInfo = null;
        returnValue = XvQueryAdaptors(pDisplay, DefaultRootWindow(pDisplay), &adaptors, &pAdaptorInfo);
@@ -334,28 +117,11 @@ _CheckXvExtension(Display* pDisplay, int* pFirstPort, int* pCountPort)
                return false;
        }
 
-//     SysLog(NID_UI_CTRL, "XvQueryAdaptors returned the following:");
-//     SysLog(NID_UI_CTRL, "%d adaptors available.", adaptors);
-
        int port = -1;
        if (adaptors > 0 && pAdaptorInfo != null)
        {
                for (unsigned int i = 0; i < adaptors; i++)
                {
-       //              SysLog(NID_UI_CTRL, " name:        %s"
-       //                                                              " type:        %s%s%s%s%s"
-       //                                                              " first port:  %ld"
-       //                                                              " ports:       %ld",
-       //                                      pAdaptorInfo[i].name,
-       //                                      (pAdaptorInfo[i].type & XvInputMask) ? "input | " : "",
-       //                                      (pAdaptorInfo[i].type & XvOutputMask) ? "output | " : "",
-       //                                      (pAdaptorInfo[i].type & XvVideoMask) ? "video | " : "",
-       //                                      (pAdaptorInfo[i].type & XvStillMask) ? "still | " : "",
-       //                                      (pAdaptorInfo[i].type & XvImageMask) ? "image | " : "",
-       //                                      pAdaptorInfo[i].base_id,
-       //                                      pAdaptorInfo[i].num_ports);
-       //              SysLog(NID_UI_CTRL, " format list: %d", i);
-
                        for (unsigned int j = 0; j < pAdaptorInfo[i].num_formats; j++)
                        {
                                SysSecureLog(NID_UI_CTRL, "The current value of depth is %d and visual is %ld.",
@@ -409,38 +175,6 @@ OnPixmapDamaged(void* pData, int type, void* pEvent)
        evas_object_image_filled_set(pImageObject, EINA_TRUE);
        evas_object_image_data_update_add(pImageObject, 0, 0, w, h);
 
-#if OVERLAY_PIXMAP_DUMP
-
-       if (gDrmFd > -1)
-       {
-               close(gDrmFd);
-               gDrmFd = -1;
-       }
-
-       if (gTbmBufmgr)
-       {
-               tbm_bufmgr_deinit(gTbmBufmgr);
-               gTbmBufmgr = null;
-       }
-
-       if (gTbmBufmgr == null)
-       {
-               gTbmBufmgr = bufmgr_get((Display*)ecore_x_display_get(), pixmap);
-       }
-
-       if (gTbmBufmgr != null)
-       {
-               pixmap_update((Display*)ecore_x_display_get(), gTbmBufmgr, pixmap, 0, 0, w, h);
-       }
-       else
-       {
-               SysSecureLog(NID_UI_CTRL, "can't get pixmap gBufmgr");
-       }
-
-       SysSecureLog(NID_UI_CTRL, "dump pixmap[%d]", pixmap);
-
-#endif // OVERLAY_PIXMAP_DUMP
-
        return ECORE_CALLBACK_DONE;
 }
 
@@ -479,7 +213,7 @@ namespace Tizen { namespace Ui { namespace Controls
 {
 int _OverlayAgent::__overlayAgentXvPortCount = 0;
 int _OverlayAgent::__baseXvPort = 0;
-bool _OverlayAgent::__isPortGrapped[]={false,};
+bool _OverlayAgent::__isPortGrabbed[]={false,};
 
 int _OverlayAgent::__overlayAgentcount = 0;
 int _OverlayAgent::__dstRectMinWidth = -1;
@@ -628,22 +362,6 @@ _OverlayAgent::~_OverlayAgent(void)
                __pVisualElement = null;
        }
 
-#if OVERLAY_PIXMAP_DUMP
-
-       if (gDrmFd > -1)
-       {
-               close(gDrmFd);
-               gDrmFd = -1;
-       }
-
-       if (gTbmBufmgr)
-       {
-               tbm_bufmgr_deinit(gTbmBufmgr);
-               gTbmBufmgr = null;
-       }
-
-#endif //OVERLAY_PIXMAP_DUMP
-
 }
 
 result
@@ -1172,7 +890,7 @@ _OverlayAgent::GrabXvPort(void)
        int i, tempPort = 0;
        for (i = 0; i < portCount; i++)
        {
-               if(!__isPortGrapped[i])
+               if(!__isPortGrabbed[i])
                {
                        tempPort = firstXvPort + i;
                        if (XvGrabPort(pDisplay, tempPort, 0) != Success)
@@ -1183,7 +901,7 @@ _OverlayAgent::GrabXvPort(void)
                        {
                                __xvPort = tempPort;
                                __grabXvPort = true;
-                               __isPortGrapped[i] = true;
+                               __isPortGrabbed[i] = true;
                                break;
                        }
                }
@@ -1405,7 +1123,7 @@ _OverlayAgent::UngrabXvPort(void)
 
                SysSecureLog(NID_UI_CTRL, "The current value of UngrabXvPort port is %d, pixmap is %d and style is %d", __xvPort, __pixmap, __style);
 
-               __isPortGrapped[__xvPort-__baseXvPort] = false;
+               __isPortGrabbed[__xvPort-__baseXvPort] = false;
                __xvPort = -1;
                __grabXvPort = false;
                __overlayAgentXvPortCount--;
index 4874414..38af41e 100644 (file)
@@ -103,7 +103,6 @@ CheckFinalRect(Tizen::Graphics::Rectangle& userRect,Tizen::Graphics::Rectangle&
 
                return false;
        }
-
        return true;
 }
 
index 2df5153..3e95345 100644 (file)
@@ -76,12 +76,6 @@ _PanelImpl::CreatePanelImplN(Panel* pControl, const FloatRectangle& rect, GroupS
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        return pImpl;
-
-CATCH:
-       delete pImpl;
-
-       SetLastResult(r);
-       return null;
 }
 
 const _PanelImpl*
index 0974366..6b02ca6 100644 (file)
@@ -580,5 +580,15 @@ _Popup::IsRotationSynchronized(void) const
        return true;
 }
 
+void
+_Popup::OnWindowStateChanged(void)
+{
+       SetOrientationCallbackModeEnabled(true);
+       
+       _Window::OnWindowStateChanged();
+
+       SetOrientationCallbackModeEnabled(false);
+}
+
 }}} // Tizen::Ui::Controls
 
index c28b310..a983efc 100644 (file)
@@ -201,7 +201,8 @@ _PopupPresenter::SetTitleTextObject(const String &title)
        __pTextObject = new (std::nothrow) TextObject();
        SysTryReturn(NID_UI_CTRL, __pTextObject != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-       __pTextObject->Construct();
+       r = __pTextObject->Construct();
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS , , r, "[%s] Propagating.", GetErrorMessage(r));
 
        pSimpleText = new (std::nothrow) TextSimple(const_cast <wchar_t*>(title.GetPointer()),
                                                                                                                                title.GetLength(),
index f8894d4..1eca1a5 100644 (file)
@@ -165,7 +165,9 @@ _ProgressPopupPresenter::SetTitleTextObject(void)
                        r = SetFontInfo(FONT_STYLE_PLAIN, titleTextSize);
                        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Failed to set font.", GetErrorMessage(r));
 
-                       __pTitleTextObject->Construct();
+                       r = __pTitleTextObject->Construct();
+                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
                        TextSimple* pSimpleTextForTitleText = new (std::nothrow) TextSimple(const_cast <wchar_t*>(__pProgressPopup->GetTitleText().GetPointer()),
                                                                                                                                                                __pProgressPopup->GetTitleText().GetLength(),
                                                                                                                                                                TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
@@ -265,7 +267,9 @@ _ProgressPopupPresenter::SetTextObject(void)
                        r = SetFontInfo(FONT_STYLE_PLAIN, bodyTextSize);
                        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Failed to set font.", GetErrorMessage(r));
 
-                       __pBodyTextObject->Construct();
+                       r = __pBodyTextObject->Construct();
+                       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
                        TextSimple* pSimpleTextForBodyText = new (std::nothrow) TextSimple(const_cast <wchar_t*>(__pProgressPopup->GetText().GetPointer()),
                                                                                                                                                                __pProgressPopup->GetText().GetLength(),
                                                                                                                                                                TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
@@ -370,12 +374,15 @@ _ProgressPopupPresenter::PlayProcessAnimation(void)
 result
 _ProgressPopupPresenter::StopProcessAnimation(void)
 {
-       __pAnimation->Stop();
+       if (__pAnimation != null)
+       {
+               __pAnimation->Stop();
 
-       __pProgressPopup->DetachChild(*__pAnimation);
+               __pProgressPopup->DetachChild(*__pAnimation);
 
-       delete __pAnimation;
-       __pAnimation = null;
+               delete __pAnimation;
+               __pAnimation = null;
+       }
 
        return E_SUCCESS;
 }
index 3800e56..9b09327 100644 (file)
@@ -403,11 +403,11 @@ _ScrollPanel::OnAccessibilityReadingElement(const _AccessibilityContainer& contr
        return __pScrollPanelPresenter->OnAccessibilityReadingElement(control, element);
 }
 bool
-_ScrollPanel::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_ScrollPanel::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        ClearLastResult();
 
-       return __pScrollPanelPresenter->OnAccessibilityReadedElement(control, element);
+       return __pScrollPanelPresenter->OnAccessibilityReadElement(control, element);
 }
 
 bool
index e8bfb2a..39fca9b 100644 (file)
@@ -87,12 +87,6 @@ _ScrollPanelImpl::CreateScrollPanelImplN(ScrollPanel* pControl, const FloatRecta
        pCore->SetFixingClientBoundsEnabled(!_AppInfo::IsOspCompat());
 
        return pImpl;
-
-CATCH:
-       delete pImpl;
-
-       SetLastResult(r);
-       return null;
 }
 
 const _ScrollPanelImpl*
index e30b8ab..09d4103 100644 (file)
@@ -1181,7 +1181,7 @@ _ScrollPanelPresenter::OnAccessibilityReadingElement(const _AccessibilityContain
        return false;
 }
 bool
-_ScrollPanelPresenter::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_ScrollPanelPresenter::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }
index edcdad5..5cc11be 100644 (file)
@@ -424,42 +424,42 @@ _SliderPresenter::LoadBitmap(void)
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        // for GROUP_STYLE_TOP
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgTopBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgTopBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
 
        __pBgTopBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgTopBitmap,Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgTopEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgTopEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 
        // for GROUP_STYLE_MIDDLE
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgMiddleBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgMiddleBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pBgMiddleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgMiddleBitmap,Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgMiddleEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgMiddleEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 
        // for GROUP_STYLE_BOTTOM
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgBottomBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgBottomBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pBgBottomBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgBottomBitmap,Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgBottomEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgBottomEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        // for GROUP_STYLE_SINGLE and GROUP_STYLE_NONE
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgSingleBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgSingleBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pBgSingleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgSingleBitmap, Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
@@ -471,7 +471,7 @@ _SliderPresenter::LoadBitmap(void)
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgSingleEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgSingleEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        opacity = __currentBgColor.GetAlpha();
@@ -823,6 +823,7 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
        Bitmap* pBgBitmap = null;
        Bitmap* pBgEffectBitmap = null;
        Bitmap* pBgGroupBitmap = null;
+       bool isCustomBitmap = false;
 
        int opacity = 0;
        result r = E_SUCCESS;
@@ -834,6 +835,7 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
                switch (__groupStyle)
                {
                case GROUP_STYLE_TOP:
+                       isCustomBitmap = IS_CUSTOM_BITMAP(SLIDER::GROUPED_TOP_BG_NORMAL);
                        pBgEffectBitmap = __pBgTopEffectBitmap;
                        if (__pSlider->GetColor() == __currentBgColor)
                        {
@@ -863,6 +865,7 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
                        break;
 
                case GROUP_STYLE_MIDDLE:
+                       isCustomBitmap = IS_CUSTOM_BITMAP(SLIDER::GROUPED_MIDDLE_BG_NORMAL);
                        pBgEffectBitmap = __pBgMiddleEffectBitmap;
                        if (__pSlider->GetColor() == __currentBgColor)
                        {
@@ -892,6 +895,7 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
                        break;
 
                case GROUP_STYLE_BOTTOM:
+                       isCustomBitmap = IS_CUSTOM_BITMAP(SLIDER::GROUPED_BOTTOM_BG_NORMAL);
                        pBgEffectBitmap = __pBgBottomEffectBitmap;
                        if (__pSlider->GetColor() == __currentBgColor)
                        {
@@ -921,6 +925,7 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
                        break;
 
                case GROUP_STYLE_SINGLE:
+                       isCustomBitmap = IS_CUSTOM_BITMAP(SLIDER::GROUPED_SINGLE_BG_NORMAL);
                        pBgEffectBitmap = __pBgSingleEffectBitmap;
                        if (__pSlider->GetColor() == __currentBgColor)
                        {
@@ -984,7 +989,10 @@ _SliderPresenter::DrawBackground(Canvas& canvas)
                DrawBitmap(canvas, __rect, pBgBitmap);
                if ( __groupStyle != GROUP_STYLE_NONE)
                {
-                       DrawBitmap(canvas, __rect, pBgEffectBitmap);
+                       if (isCustomBitmap == false)
+                       {
+                               DrawBitmap(canvas, __rect, pBgEffectBitmap);
+                       }
                }
        }
        return E_SUCCESS;
index 48b5675..a1e8503 100644 (file)
@@ -189,11 +189,6 @@ CATCH:
 
        if (__pFirstPaneParent)
        {
-               if (__pFirstPane)
-               {
-                       __pFirstPaneParent->DetachChild(*__pFirstPane);
-               }
-
                DetachChild(*__pFirstPaneParent);
 
                delete __pFirstPaneParent;
@@ -202,11 +197,6 @@ CATCH:
 
        if (__pSecondPaneParent)
        {
-               if (__pSecondPane)
-               {
-                       __pSecondPaneParent->DetachChild(*__pSecondPane);
-               }
-
                DetachChild(*__pSecondPaneParent);
 
                delete __pSecondPaneParent;
@@ -253,6 +243,22 @@ _SplitPanel::~_SplitPanel(void)
                __pDividerVisualElement = null;
        }
 
+       if (__pFirstPaneParent)
+       {
+               DetachChild(*__pFirstPaneParent);
+
+               delete __pFirstPaneParent;
+               __pFirstPaneParent = null;
+       }
+
+       if (__pSecondPaneParent)
+       {
+               DetachChild(*__pSecondPaneParent);
+
+               delete __pSecondPaneParent;
+               __pSecondPaneParent = null;
+       }
+
        ClearLastResult();
 }
 
@@ -388,15 +394,21 @@ _SplitPanel::SetPane(_Control* pControl, SplitPanelPaneOrder paneOrder)
 
        if (paneOrder == SPLIT_PANEL_PANE_ORDER_FIRST)
        {
-               r = __pFirstPaneParent->AttachChild(*pControl);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               if (pControl != null)
+               {
+                       r = __pFirstPaneParent->AttachChild(*pControl);
+                       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               }
 
                __pFirstPane = pControl;
        }
        else
        {
-               r = __pSecondPaneParent->AttachChild(*pControl);
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               if (pControl != null)
+               {
+                       r = __pSecondPaneParent->AttachChild(*pControl);
+                       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+               }
 
                __pSecondPane = pControl;
        }
index a743702..64fce2d 100644 (file)
@@ -1426,7 +1426,7 @@ _Tab::OnAccessibilityReadingElement(const _AccessibilityContainer& control, cons
        return false;
 }
 bool
-_Tab::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_Tab::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }
index edba251..e135318 100644 (file)
@@ -581,9 +581,9 @@ _TabBar::OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& contro
 }
 
 bool
-_TabBar::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_TabBar::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
-       return __pTabBarPresenter->OnAccessibilityReadedElement(control, element);
+       return __pTabBarPresenter->OnAccessibilityReadElement(control, element);
 }
 
 bool
index 86b3b26..5eeef05 100644 (file)
@@ -56,6 +56,7 @@ _TabBarPresenter::_TabBarPresenter(_TabBar& tabBar)
        , __sideMargin(0.0f)
        , __itemMargin(0.0f)
        , __arrowMargin(0.0f)
+       , __itemMaxWidth(0.0f)
        , __pBgBitmapCached(null)
        , __pBgEffectBitmapCached(null)
        , __pLeftArrowBitmapCached(null)
@@ -66,10 +67,11 @@ _TabBarPresenter::_TabBarPresenter(_TabBar& tabBar)
                __pItemBgBitmapCached[i] = null;
        }
 
-       GET_SHAPE_CONFIG(TABBAR::TOP_MARGIN,   _CONTROL_ORIENTATION_PORTRAIT, __topMargin);
-       GET_SHAPE_CONFIG(TABBAR::SIDE_MARGIN,  _CONTROL_ORIENTATION_PORTRAIT, __sideMargin);
-       GET_SHAPE_CONFIG(TABBAR::ITEM_MARGIN,  _CONTROL_ORIENTATION_PORTRAIT, __itemMargin);
-       GET_SHAPE_CONFIG(TABBAR::ARROW_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __arrowMargin);
+       GET_SHAPE_CONFIG(TABBAR::TOP_MARGIN,     _CONTROL_ORIENTATION_PORTRAIT, __topMargin);
+       GET_SHAPE_CONFIG(TABBAR::SIDE_MARGIN,    _CONTROL_ORIENTATION_PORTRAIT, __sideMargin);
+       GET_SHAPE_CONFIG(TABBAR::ITEM_MARGIN,    _CONTROL_ORIENTATION_PORTRAIT, __itemMargin);
+       GET_SHAPE_CONFIG(TABBAR::ARROW_MARGIN,   _CONTROL_ORIENTATION_PORTRAIT, __arrowMargin);
+       GET_SHAPE_CONFIG(TABBAR::ITEM_MAX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemMaxWidth);
 }
 
 _TabBarPresenter::~_TabBarPresenter(void)
@@ -722,6 +724,15 @@ _TabBarPresenter::DrawItem(Tizen::Graphics::Canvas* pCanvas)
                __pTextObject->SetBounds(textRect);
                __pTextObject->SetFont(__pFont, 0, __pTextObject->GetTextLength());
                __pTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_NONE);
+               if (itemBounds.width < __itemMaxWidth)
+               {
+                       __pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+               }
+               else
+               {
+                       __pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
+                       __pTextObject->SetTextObjectEllipsisType(TEXT_OBJECT_ELLIPSIS_TYPE_TAIL);
+               }
                __pTextObject->Draw(*_CanvasImpl::GetInstance(*pCanvas));
        } // end for loop
 }
@@ -1029,7 +1040,7 @@ _TabBarPresenter::OnAccessibilityFocusMovedPrevious(const _AccessibilityContaine
 }
 
 bool
-_TabBarPresenter::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_TabBarPresenter::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }
index c6428df..505267c 100644 (file)
@@ -32,6 +32,7 @@
 #include "FUiCtrl_TableView.h"
 #include "FUi_CoordinateSystemUtils.h"
 #include "FUi_Math.h"
+#include "FUiCtrl_LabelImpl.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::Base::Runtime;
@@ -591,7 +592,7 @@ _TableViewItem::CreateCheckBox(void)
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
 
-               __pItemAnnex = _Label::CreateLabelN();
+               __pItemAnnex = new (std::nothrow) Label();
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -599,10 +600,10 @@ _TableViewItem::CreateCheckBox(void)
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, leftMargin);
 
                float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height);
-               __pItemAnnex->SetBounds(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight));
+               __pItemAnnex->Construct(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L"");
                __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0));
 
-               AttachSystemChild(*__pItemAnnex);
+               AttachSystemChild(*GetLabelCore(__pItemAnnex));
        }
 
        return r;
@@ -621,7 +622,7 @@ _TableViewItem::CreateRadioBox(void)
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
 
-               __pItemAnnex = _Label::CreateLabelN();
+               __pItemAnnex = new (std::nothrow) Label();
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -629,10 +630,10 @@ _TableViewItem::CreateRadioBox(void)
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, leftMargin);
 
                float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height);
-               __pItemAnnex->SetBounds(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight));
+               __pItemAnnex->Construct(FloatRectangle(leftMargin, ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L"");
                __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0));
 
-               AttachSystemChild(*__pItemAnnex);
+               AttachSystemChild(*GetLabelCore(__pItemAnnex));
        }
 
        return r;
@@ -651,7 +652,7 @@ _TableViewItem::CreateOnOffButton(void)
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
 
-               __pItemAnnex = _Label::CreateLabelN();
+               __pItemAnnex = new (std::nothrow) Label();
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -661,10 +662,10 @@ _TableViewItem::CreateOnOffButton(void)
                leftMargin += __pDrawingProperty->scrollMargin;
 
                float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height);
-               __pItemAnnex->SetBounds(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight));
+               __pItemAnnex->Construct(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L"");
                __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0));
 
-               AttachSystemChild(*__pItemAnnex);
+               AttachSystemChild(*GetLabelCore(__pItemAnnex));
        }
 
        return r;
@@ -682,7 +683,7 @@ _TableViewItem::CreateDetailButton(void)
 
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_MORE_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
                GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_MORE_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
-               __pItemAnnex = _Label::CreateLabelN();
+               __pItemAnnex = new (std::nothrow) Label();
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, __pItemAnnex != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -691,15 +692,27 @@ _TableViewItem::CreateDetailButton(void)
 
                leftMargin += __pDrawingProperty->scrollMargin;
                float itemHeight = ((__customHeight > 0) ? __customHeight : GetBoundsF().height);
-               __pItemAnnex->SetBounds(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight));
+               __pItemAnnex->Construct(FloatRectangle((GetBoundsF().width - annexWidth - leftMargin), ((itemHeight - annexHeight) / 2), annexWidth, annexHeight), L"");
                __pItemAnnex->SetBackgroundColor(Color(0, 0, 0, 0));
 
-               AttachSystemChild(*__pItemAnnex);
+               AttachSystemChild(*GetLabelCore(__pItemAnnex));
        }
 
        return r;
 }
 
+_Label*
+_TableViewItem::GetLabelCore(Label* label)
+{
+       if(label == null)
+       {
+               return null;
+       }
+
+       _LabelImpl* pImpl = _LabelImpl::GetInstance(*label);
+       return &pImpl->GetCore();
+}
+
 void
 _TableViewItem::ExposeContextItem(FloatRectangle itemBounds, float targetWidth)
 {
@@ -1169,7 +1182,7 @@ _TableViewItem::OnTouchPressed(const _Control& source, const _TouchInfo& touchin
        {
                __pressedControl = TABLE_VIEW_ITEM_PRESSED_ITEM;
        }
-       else if (&source == __pItemAnnex)
+       else if (&source == GetLabelCore(__pItemAnnex))
        {
                __pressedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX;
 
@@ -1232,7 +1245,7 @@ _TableViewItem::OnTouchReleased(const _Control& source, const _TouchInfo& touchi
        {
                __releasedControl = TABLE_VIEW_ITEM_PRESSED_ITEM;
        }
-       else if (&source == __pItemAnnex)
+       else if (&source == GetLabelCore(__pItemAnnex))
        {
                __releasedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX;
        }
@@ -1418,7 +1431,7 @@ _TableViewItem::OnTouchMoved(const _Control& source, const _TouchInfo& touchinfo
                SetItemChanged(true);
                Invalidate();
        }
-       else if (&source == __pItemAnnex)
+       else if (&source == GetLabelCore(__pItemAnnex))
        {
                if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED)
                {
@@ -1539,7 +1552,7 @@ _TableViewItem::OnChildAttached(const _Control& child)
 
        if ((__annexStyle == TABLE_VIEW_ANNEX_STYLE_MARK) || (__annexStyle == TABLE_VIEW_ANNEX_STYLE_RADIO))
        {
-               if (__pItemAnnex == &child)
+               if (GetLabelCore(__pItemAnnex) == &child)
                {
                        return;
                }
@@ -1554,10 +1567,6 @@ _TableViewItem::OnChildAttached(const _Control& child)
                bounds.x += (leftMargin * 2) + annexWidth;
                pControl->SetBounds(bounds);
        }
-       else if((__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING) || (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER))
-       {
-               pControl->SetTouchPressThreshold(SENSITIVE);
-       }
 }
 
 void
@@ -1568,12 +1577,15 @@ _TableViewItem::OnChildDetached(const _Control& child)
                __individualSelectionControls.Remove(child, false);
        }
 
-       if (&child == __pSimpleItemText)
+       _Label* pSimpleItemTextCore = GetLabelCore(__pSimpleItemText);
+       _Label* pSimpleItemBitmapCore = GetLabelCore(__pSimpleItemBitmap);
+
+       if (&child == pSimpleItemTextCore)
        {
                __pSimpleItemText = null;
        }
 
-       if (&child == __pSimpleItemBitmap)
+       if (&child == pSimpleItemBitmapCore)
        {
                __pSimpleItemBitmap = null;
        }
@@ -1818,8 +1830,6 @@ _TableViewItem::PlayCheckBoxAnimation(void)
        float annexWidth = 0.0f;
        float annexHeight = 0.0f;
 
-       Color canvasBackgroundColor;
-
        if (__drawingStatus == TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL)
        {
                r = GET_BITMAP_CONFIG_N(TABLEVIEW::CHECKBOX_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pCheckBoxBg);
@@ -1841,8 +1851,6 @@ _TableViewItem::PlayCheckBoxAnimation(void)
        pCanvas = new (std::nothrow) Canvas();
        SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-       GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor);
-
        r = pCanvas->Construct(bounds);
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -1874,7 +1882,7 @@ _TableViewItem::PlayCheckBoxAnimation(void)
        if(__pItemAnnex)
        {
                __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap);
-               __pItemAnnex->Invalidate();
+               __pItemAnnex->Invalidate(false);
        }
 
 CATCH:
@@ -1993,38 +2001,38 @@ _TableViewItem::DrawItemBackground(void)
                }
        }
 
-       if(__enabledState)
+       if(IsContextItem())
        {
-               if (__pDrawingProperty->sectionStyleEnabled == true)
-               {
-                       DrawSectionStyleBackground();
-               }
-               else if (__itemType == TABLE_VIEW_ITEM_TYPE_HEADER || __itemType == TABLE_VIEW_ITEM_TYPE_FOOTER)
-               {
-                       SetBackgroundColor(Color(0, 0, 0, 0));
-                       __pHighlightVisualElement->SetBackgroundColor(_Colorf(0.0f, 0.0f, 0.0f, 0.0f));
-               }
-               else if(__itemType == TABLE_VIEW_ITEM_TYPE_TITLE)
-               {
-                       __pHighlightVisualElement->SetBackgroundColor(_Colorf((float)bgColor.GetRed() / 255.0f, (float)bgColor.GetGreen() / 255.0f, (float)bgColor.GetBlue() / 255.0f, (float)bgColor.GetAlpha() / 255.0f));
-               }
-               else
-               {
-                       SetBackgroundColor(__colorItemBg[TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL]);
-
-                       __pHighlightVisualElement->SetBackgroundColor(_Colorf((float)bgColor.GetRed() / 255.0f, (float)bgColor.GetGreen() / 255.0f, (float)bgColor.GetBlue() / 255.0f, (float)bgColor.GetAlpha() / 255.0f));
-
-                       if (__pDrawingProperty->groupedLookEnabled == true)
-                       {
-                               DrawGroupedLook();
-                       }
-               }
+               DrawContextItemBackground();
+       }
+       else if (__pDrawingProperty->sectionStyleEnabled == true)
+       {
+               DrawSectionStyleBackground();
        }
        else
        {
-               if (__pDrawingProperty->sectionStyleEnabled == true)
+               if(__enabledState)
                {
-                       DrawSectionStyleBackground();
+                       if (__itemType == TABLE_VIEW_ITEM_TYPE_HEADER || __itemType == TABLE_VIEW_ITEM_TYPE_FOOTER)
+                       {
+                               SetBackgroundColor(Color(0, 0, 0, 0));
+                               __pHighlightVisualElement->SetBackgroundColor(_Colorf(0.0f, 0.0f, 0.0f, 0.0f));
+                       }
+                       else if(__itemType == TABLE_VIEW_ITEM_TYPE_TITLE)
+                       {
+                               __pHighlightVisualElement->SetBackgroundColor(_Colorf((float)bgColor.GetRed() / 255.0f, (float)bgColor.GetGreen() / 255.0f, (float)bgColor.GetBlue() / 255.0f, (float)bgColor.GetAlpha() / 255.0f));
+                       }
+                       else
+                       {
+                               SetBackgroundColor(__colorItemBg[TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL]);
+
+                               __pHighlightVisualElement->SetBackgroundColor(_Colorf((float)bgColor.GetRed() / 255.0f, (float)bgColor.GetGreen() / 255.0f, (float)bgColor.GetBlue() / 255.0f, (float)bgColor.GetAlpha() / 255.0f));
+
+                               if (__pDrawingProperty->groupedLookEnabled == true)
+                               {
+                                       DrawGroupedLook();
+                               }
+                       }
                }
                else
                {
@@ -2377,6 +2385,55 @@ CATCH:
 }
 
 void
+_TableViewItem::DrawContextItemBackground(void)
+{
+       Canvas* pCanvas = null;
+       Bitmap* pContextBg = null;
+       Bitmap* pContextBgEf = null;
+       Bitmap* pReplacementContextBg = null;
+       Color bgColor = __colorItemBg[__drawingStatus];
+
+       FloatRectangle bounds = GetBoundsF();
+       result r = E_SUCCESS;
+
+       r = GET_BITMAP_CONFIG_N(TABLEVIEW::QUICK_MENU_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pContextBg);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] ContextItem image load failed");
+
+       r = GET_BITMAP_CONFIG_N(TABLEVIEW::QUICK_MENU_BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, pContextBgEf);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] ContextItem image load failed");
+
+       pCanvas = GetVisualElement()->GetCanvasN();
+       SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+
+       pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
+       pCanvas->Clear();
+
+       if(__enabledState)
+       {
+               if(bgColor == null)
+               {
+                       GET_COLOR_CONFIG(TABLEVIEW::CONTEXTITEM_BG_NORMAL, bgColor);
+               }
+       }
+       else
+       {
+               GET_COLOR_CONFIG(TABLEVIEW::ITEM_BG_DISABLED, bgColor);
+       }
+       pReplacementContextBg = Tizen::Graphics::_BitmapImpl::GetColorReplacedBitmapN(*pContextBg, Color::GetColor(COLOR_ID_MAGENTA), bgColor);
+       SysTryCatch(NID_UI_CTRL, pReplacementContextBg != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+
+       DrawBitmap(*pCanvas, FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pReplacementContextBg);
+       DrawBitmap(*pCanvas, FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pContextBgEf);
+
+CATCH:
+       delete pCanvas;
+       delete pContextBg;
+       delete pContextBgEf;
+       delete pReplacementContextBg;
+}
+
+
+void
 _TableViewItem::CreateAnnexStyle(void)
 {
        switch (__annexStyle)
@@ -2440,7 +2497,6 @@ _TableViewItem::DrawCheckBox(void)
        FloatRectangle bounds;
        float annexWidth = 0.0f;
        float annexHeight = 0.0f;
-       Color canvasBackgroundColor;
 
        if(__enabledState)
        {
@@ -2479,8 +2535,6 @@ _TableViewItem::DrawCheckBox(void)
        pCanvas = new (std::nothrow) Canvas();
        SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-       GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor);
-
        pCanvas->Construct(bounds);
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -2506,7 +2560,7 @@ _TableViewItem::DrawCheckBox(void)
        _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true);
 
        __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap);
-       __pItemAnnex->Invalidate();
+       __pItemAnnex->Invalidate(false);
 
 CATCH:
        delete pCheckBox;
@@ -2529,7 +2583,6 @@ _TableViewItem::DrawRadioBox(void)
        FloatRectangle bounds;
        float annexWidth = 0.0f;
        float annexHeight = 0.0f;
-       Color canvasBackgroundColor;
 
        if(__enabledState)
        {
@@ -2566,8 +2619,6 @@ _TableViewItem::DrawRadioBox(void)
        pCanvas = new (std::nothrow) Canvas();
        SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-       GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor);
-
        pCanvas->Construct(bounds);
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -2586,7 +2637,7 @@ _TableViewItem::DrawRadioBox(void)
        _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true);
 
        __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap);
-       __pItemAnnex->Invalidate();
+       __pItemAnnex->Invalidate(false);
 
 CATCH:
        delete pRadioButton;
@@ -2612,7 +2663,6 @@ _TableViewItem::DrawOnOffButton(void)
        float annexWidth = 0.0f;
        float annexHeight = 0.0f;
        float annexMargin = 0.0f;
-       Color canvasBackgroundColor;
 
        if (IsChecked() == true)
        {
@@ -2655,8 +2705,6 @@ _TableViewItem::DrawOnOffButton(void)
        pCanvas = new (std::nothrow) Canvas();
        SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-       GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor);
-
        pCanvas->Construct(bounds);
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -2686,7 +2734,7 @@ _TableViewItem::DrawOnOffButton(void)
        _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true);
 
        __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap);
-       __pItemAnnex->Invalidate();
+       __pItemAnnex->Invalidate(false);
 
 CATCH:
        delete pOnOffButton;
@@ -2797,7 +2845,6 @@ _TableViewItem::DrawAnnexOnOffHandler(float position)
        float annexMargin = 0.0f;
        float annexAbsoluteBoundsStart = 0.0f;
        float annexAbsoluteBoundsEnd = 0.0f;
-       Color canvasBackgroundColor;
        float nextHandlerBounds = 0;
 
        r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
@@ -2822,8 +2869,6 @@ _TableViewItem::DrawAnnexOnOffHandler(float position)
        pCanvas = new (std::nothrow) Canvas();
        SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-       GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor);
-
        pCanvas->Construct(bounds);
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -2871,7 +2916,7 @@ _TableViewItem::DrawAnnexOnOffHandler(float position)
        _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true);
 
        __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap);
-       __pItemAnnex->Invalidate();
+       __pItemAnnex->Invalidate(false);
 
 CATCH:
        delete pOnOffButton;
@@ -2900,7 +2945,6 @@ _TableViewItem::DrawDetailButton(void)
        FloatRectangle bounds;
        float annexWidth = 0.0f;
        float annexHeight = 0.0f;
-       Color canvasBackgroundColor;
        bool themeBackgroundBitmap = false;
 
        themeBackgroundBitmap = IS_CUSTOM_BITMAP(TABLEVIEW::CIRCLE_BUTTON_BG_NORMAL);
@@ -2979,8 +3023,6 @@ _TableViewItem::DrawDetailButton(void)
        pCanvas = new (std::nothrow) Canvas();
        SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-       GET_COLOR_CONFIG(TABLEVIEW::ITEM_ANNEX_CANVAS_BG_NORMAL, canvasBackgroundColor);
-
        pCanvas->Construct(bounds);
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
@@ -3003,7 +3045,7 @@ _TableViewItem::DrawDetailButton(void)
        _BitmapImpl::ConvertToNonpremultiplied(*pMergeBitmap, true);
 
        __pItemAnnex->SetBackgroundBitmap(*pMergeBitmap);
-       __pItemAnnex->Invalidate();
+       __pItemAnnex->Invalidate(false);
 
 CATCH:
        delete pDetail;
@@ -3340,7 +3382,7 @@ _TableViewItem::DrawSimpleItem(void)
                }
 
                __pSimpleItemText->SetTextColor(textColor);
-               __pSimpleItemText->Invalidate();
+               __pSimpleItemText->Invalidate(false);
        }
 }
 result
@@ -3420,9 +3462,10 @@ _TableViewItem::SetSimpleItemContents(const Tizen::Base::String& text, const Tiz
                __pSimpleItemBitmap->SetBackgroundBitmap(*pBitmap);
                __pSimpleItemBitmap->SetBounds(bitmapRect);
 
-               if (!__pSimpleItemBitmap->HasParent())
+               _Label* pSimpleItemBitmapCore = GetLabelCore(__pSimpleItemBitmap);
+               if (!pSimpleItemBitmapCore->HasParent())
                {
-                       r = AttachChild(*__pSimpleItemBitmap);
+                       r = AttachChild(*pSimpleItemBitmapCore);
                        SysTryReturn(NID_UI_CTRL, __pSimpleItemBitmap != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
                }
        }
@@ -3433,9 +3476,10 @@ _TableViewItem::SetSimpleItemContents(const Tizen::Base::String& text, const Tiz
                __pSimpleItemText->SetText(text);
                __pSimpleItemText->SetBounds(textRect);
 
-               if (!__pSimpleItemText->HasParent())
+               _Label* pSimpleItemTextCore = GetLabelCore(__pSimpleItemText);
+               if (!pSimpleItemTextCore->HasParent())
                {
-                       r = AttachChild(*__pSimpleItemText);
+                       r = AttachChild(*pSimpleItemTextCore);
                        SysTryReturn(NID_UI_CTRL, __pSimpleItemText != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
                }
        }
@@ -3450,11 +3494,13 @@ _TableViewItem::CreateSimpleItemContents(bool textOnly)
 
        if (__pSimpleItemText == null)
        {
-               __pSimpleItemText = _Label::CreateLabelN();
+               __pSimpleItemText = new (std::nothrow) Label();
 
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, __pSimpleItemText != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
+               __pSimpleItemText->Construct(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f), L"");
+
                __pSimpleItemText->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
                __pSimpleItemText->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                if (__itemType == TABLE_VIEW_ITEM_TYPE_TITLE)
@@ -3473,10 +3519,14 @@ _TableViewItem::CreateSimpleItemContents(bool textOnly)
        {
                if (__pSimpleItemBitmap == null)
                {
-                       __pSimpleItemBitmap = _Label::CreateLabelN();
+                       __pSimpleItemBitmap = new (std::nothrow) Label();
+
+                       r = GetLastResult();
                        SysTryReturn(NID_UI_CTRL, __pSimpleItemBitmap != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-                       __pSimpleItemText->SetBackgroundColor(Color(0, 0, 0, 0));
+                       __pSimpleItemBitmap->Construct(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f), L"");
+
+                       __pSimpleItemBitmap->SetBackgroundColor(Color(0, 0, 0, 0));
                }
 
        }
@@ -3537,27 +3587,25 @@ _TableViewItem::SetSectionHeaderFooterContents(const Tizen::Base::String& text,
                GET_COLOR_CONFIG(TABLEVIEW::GROUPITEM_TEXT_NORMAL, textColor);
                GET_SHAPE_CONFIG(TABLEVIEW::GROUPITEM_DEFAULT_TEXT_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, contentsHeight);
 
-               __pHeaderFooterItemText = _Label::CreateLabelN();
+               __pHeaderFooterItemText = new (std::nothrow) Label();
 
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, __pHeaderFooterItemText != null, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-               __pHeaderFooterItemText->SetTextHorizontalAlignment(alignment);
-               __pHeaderFooterItemText->SetTextColor(textColor);
-               __pHeaderFooterItemText->SetBackgroundColor(Color(0, 0, 0, 0));
-
                if (isHeader)
                {
                        positionY = GetBoundsF().height - contentsHeight;
                }
+               __pHeaderFooterItemText->Construct(FloatRectangle(0.0f, positionY, GetBoundsF().width, contentsHeight), text);
 
-               __pHeaderFooterItemText->SetBounds(FloatRectangle(0.0f, positionY, GetBoundsF().width, contentsHeight));
+               __pHeaderFooterItemText->SetTextHorizontalAlignment(alignment);
+               __pHeaderFooterItemText->SetTextColor(textColor);
+               __pHeaderFooterItemText->SetBackgroundColor(Color(0, 0, 0, 0));
 
-               AttachChild(*__pHeaderFooterItemText);
+               _Label* pHeaderFooterItemTextCore = GetLabelCore(__pHeaderFooterItemText);
+               AttachChild(*pHeaderFooterItemTextCore);
        }
 
-       __pHeaderFooterItemText->SetText(text);
-
        return E_SUCCESS;
 }
 
@@ -3567,7 +3615,7 @@ _TableViewItem::SetSectionHeaderFooterAlignment(HorizontalAlignment alignment)
        if (__pHeaderFooterItemText != null)
        {
                __pHeaderFooterItemText->SetTextHorizontalAlignment(alignment);
-               __pHeaderFooterItemText->Invalidate();
+               __pHeaderFooterItemText->Invalidate(false);
        }
 
        return E_SUCCESS;
@@ -3741,7 +3789,8 @@ _TableViewItem::AdjustAnnexBounds(void)
        // h align
        if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING || __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER || __annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED)
        {
-               if (__pItemAnnex->HasParent())
+               _Label* pAnnexCore = GetLabelCore(__pItemAnnex);
+               if (pAnnexCore->HasParent())
                {
                        FloatRectangle annexBounds = __pItemAnnex->GetBoundsF();
                        float annexPositionX = annexBounds.x;
@@ -4387,7 +4436,7 @@ _TableViewItem::OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer&
 }
 
 bool
-_TableViewItem::OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
+_TableViewItem::OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element)
 {
        return false;
 }
index e870741..dcea623 100644 (file)
@@ -1673,6 +1673,8 @@ _TableViewPresenter::OnBoundsChanged(void)
 
        if (__pProviderAdaptor != null && __modelInitialized)
        {
+               StopExpandCollapseAnimation();
+
                if (__pTableView->IsReorderModeEnabled() && __reorderInfo.itemIndex != -1)
                {
                        ResetReorderItem(__reorderInfo.groupIndex, __reorderInfo.itemIndex);
@@ -1849,22 +1851,7 @@ _TableViewPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& to
 
        __sweepOccured = false;
 
-       _VisualElement* pVisualElement = __pTableView->GetVisualElement();
-       String animationName(L"EXPAND_GROUP_ANIMATION");
-       VisualElementValueAnimation* pExpandGroupAnimation = dynamic_cast<VisualElementValueAnimation*>(pVisualElement->GetAnimationN(animationName));
-       if (pExpandGroupAnimation != null)
-       {
-               pVisualElement->RemoveAnimation(animationName);
-               delete pExpandGroupAnimation;
-       }
-
-       animationName = L"COLLAPSE_GROUP_ANIMATION";
-       VisualElementValueAnimation* pCollapseGroupAnimation = dynamic_cast<VisualElementValueAnimation*>(pVisualElement->GetAnimationN(animationName));
-       if (pCollapseGroupAnimation != null)
-       {
-               pVisualElement->RemoveAnimation(animationName);
-               delete pCollapseGroupAnimation;
-       }
+       StopExpandCollapseAnimation();
 
        return _ScrollPanelPresenter::OnTouchPressed(source, touchInfo);
 }
@@ -2719,6 +2706,27 @@ _TableViewPresenter::IsGroupExpanded(int groupIndex) const
        return __pListModel->IsGroupExpanded(groupIndex);
 }
 
+void
+_TableViewPresenter::StopExpandCollapseAnimation(void)
+{
+       _VisualElement* pVisualElement = __pTableView->GetVisualElement();
+       String animationName(L"EXPAND_GROUP_ANIMATION");
+       VisualElementValueAnimation* pExpandGroupAnimation = dynamic_cast<VisualElementValueAnimation*>(pVisualElement->GetAnimationN(animationName));
+       if (pExpandGroupAnimation != null)
+       {
+               pVisualElement->RemoveAnimation(animationName);
+               delete pExpandGroupAnimation;
+       }
+
+       animationName = L"COLLAPSE_GROUP_ANIMATION";
+       VisualElementValueAnimation* pCollapseGroupAnimation = dynamic_cast<VisualElementValueAnimation*>(pVisualElement->GetAnimationN(animationName));
+       if (pCollapseGroupAnimation != null)
+       {
+               pVisualElement->RemoveAnimation(animationName);
+               delete pCollapseGroupAnimation;
+       }
+}
+
 int
 _TableViewPresenter::LoadAllItemsInGroup(int groupIndex, bool downward)
 {
index 54355df..c7c60a5 100644 (file)
@@ -161,7 +161,7 @@ _TokenEdit::GetTokenCount(void) const
 {
        SysAssertf(__pTokenEditPresenter != null, "_TokenEditPresenter instance is null");
 
-       return __pTokenEditPresenter->GetTokenCount();
+       return __pTokenEditPresenter->GetTokenCount(true);
 }
 
 int
index 52f0f68..cc5d17a 100644 (file)
@@ -21,6 +21,7 @@
 #include <FGrp_BitmapImpl.h>
 #include <FUiAnimVisualElementAnimationGroup.h>
 #include <FGrp_TextTextSimple.h>
+#include <FGrp_FontImpl.h>
 #include "FUiAnim_VisualElement.h"
 #include "FUi_UiTouchEvent.h"
 #include "FUiCtrl_TokenEdit.h"
@@ -66,7 +67,8 @@ class _Token
        : public Object
 {
 public:
-       _Token(const String& text, Font* pEditFont);
+       _Token(void);
+       result Construct(const String& text, Font* pEditFont);
        virtual ~_Token(void);
        float GetTextPixelWidth(void) const;
        wchar_t* GetText(void) const;
@@ -90,7 +92,7 @@ private:
        _VisualElement* __pVisualElement;
 };     // _Token
 
-_Token::_Token(const String& text, Font* pEditFont)
+_Token::_Token(void)
        : pTextObject(null)
        , pFont(null)
        , currTokenLength(0)
@@ -101,13 +103,18 @@ _Token::_Token(const String& text, Font* pEditFont)
        , __textPixelHeight(0.0f)
        , __pVisualElement(null)
 {
+}
+
+result
+_Token::Construct(const String& text, Font* pEditFont)
+{
        result r = E_SUCCESS;
 
        currTokenLength = text.GetLength();
        float tokenFontSize = 0.0f;
 
        pTextObject = new (std::nothrow) TextObject;
-       SysTryReturnVoidResult(NID_UI_CTRL, pTextObject != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryReturnResult(NID_UI_CTRL, pTextObject != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        // for default initialize.
        r = pTextObject->Construct();
@@ -121,11 +128,12 @@ _Token::_Token(const String& text, Font* pEditFont)
 
        GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_TEXT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, tokenFontSize);
 
-       pFont = new (std::nothrow) Font;
-       SysTryCatch(NID_UI_CTRL, pFont != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       pFont = _FontImpl::CloneN(*pEditFont);
+       r = GetLastResult();
+       SysTryCatch(NID_UI_CTRL, pFont != null, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = pFont->Construct(pEditFont->GetFaceName(), FONT_STYLE_PLAIN, tokenFontSize);
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+       (_FontImpl::GetInstance(*pFont))->SetStyle(FONT_STYLE_PLAIN);
+       (_FontImpl::GetInstance(*pFont))->SetSize(tokenFontSize);
 
        r = pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -134,7 +142,7 @@ _Token::_Token(const String& text, Font* pEditFont)
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pVisualElement = new (std::nothrow) _VisualElement;
-       SysTryCatch(NID_UI_CTRL, __pVisualElement != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
+       SysTryCatch(NID_UI_CTRL, __pVisualElement != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        r = __pVisualElement->Construct();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to construct _VisualElement.", GetErrorMessage(r));
@@ -142,7 +150,7 @@ _Token::_Token(const String& text, Font* pEditFont)
        __pVisualElement->SetImplicitAnimationEnabled(false);
        __pVisualElement->SetOpacity(0.0f);
 
-       return;
+       return r;
 
 CATCH:
        delete pTextObject;
@@ -157,7 +165,7 @@ CATCH:
        delete pFont;
        pFont = null;
 
-       return;
+       return r;
 }
 
 result
@@ -302,6 +310,7 @@ _TokenEditPresenter::_TokenEditPresenter(void)
        , __touchPressInfo(FloatPoint(-1.0f, -1.0f))
        , __editContentFontSize(0.0f)
        , __trackTokenIndex(-1)
+       , __isAnimationInProgress(false)
 {
 }
 
@@ -913,9 +922,12 @@ _TokenEditPresenter::MakeToken(const String& tokenString)
                return E_INVALID_ARG;
        }
 
-       _Token* pToken = new (std::nothrow) _Token(inputTokenString, GetFont());
+       _Token* pToken = new (std::nothrow) _Token();
        SysTryReturnResult(NID_UI_CTRL, pToken != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
+       r = pToken->Construct(inputTokenString, GetFont());
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to construct token.", GetErrorMessage(r));
+
        r = __pTokenList->Add(static_cast <Object&>(*pToken));
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -946,6 +958,8 @@ _TokenEditPresenter::MakeToken(const String& tokenString)
        return r;
 
 CATCH:
+       __pTokenList->Remove(*pToken);
+
        delete pToken;
        pToken = null;
 
@@ -988,9 +1002,12 @@ _TokenEditPresenter::InsertTokenAt(int index, const String& token, bool isUser)
 
        result r = E_SUCCESS;
 
-       _Token* pToken = new (std::nothrow) _Token(token, GetFont());
+       _Token* pToken = new (std::nothrow) _Token();
        SysTryReturnResult(NID_UI_CTRL, pToken != null, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
+       r = pToken->Construct(token, GetFont());
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to construct token.", GetErrorMessage(r));
+
        r = __pTokenList->InsertAt(*pToken, index);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to insert token.", GetErrorMessage(r));
 
@@ -1045,6 +1062,7 @@ _TokenEditPresenter::InsertTokenAt(int index, const String& token, bool isUser)
        return r;
 
 CATCH:
+       __pTokenList->Remove(*pToken);
 
        delete pToken;
        pToken = null;
@@ -1069,9 +1087,23 @@ _TokenEditPresenter::GetTokenAt(int index) const
 }
 
 int
-_TokenEditPresenter::GetTokenCount(void) const
+_TokenEditPresenter::GetTokenCount(bool isInvokedByApp) const
 {
-       return __pTokenList->GetCount();
+       if (!isInvokedByApp)
+       {
+               return __pTokenList->GetCount();
+       }
+       else
+       {
+               if(__isAnimationInProgress)
+               {
+                       return __pTokenList->GetCount() -1;
+               }
+               else
+               {
+                       return __pTokenList->GetCount();
+               }
+       }
 }
 
 int
@@ -3200,6 +3232,7 @@ _TokenEditPresenter::OnSurroundingTextDeleted(int offset, int charCount)
 
                                if (pTokenVisualElement && __animatingIndex >= 0)
                                {
+                                       __isAnimationInProgress = true;
                                        VisualElementAnimation* pAnimation = CreateAnimationN(*pTokenVisualElement, false);
                                        pTokenVisualElement->AddAnimation(L"TokenAnimation", *pAnimation);
                                        delete pAnimation;
@@ -3516,6 +3549,7 @@ _TokenEditPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touc
 void
 _TokenEditPresenter::OnVisualElementAnimationFinished (const Tizen::Ui::Animations::VisualElementAnimation &animation, const Tizen::Base::String &keyName, Tizen::Ui::Animations::VisualElement &target, bool completedNormally)
 {
+       __isAnimationInProgress = false;
        RemoveTokenAt(GetTokenCount() - 1);
        CalculateTokenPositionFromIndex(GetTokenCount() - 1);
 
index d1f3430..83ae6be 100644 (file)
@@ -51,7 +51,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element){return true;}
index 264668f..e63dea6 100644 (file)
@@ -45,7 +45,6 @@
 #include "FUiAnim_TransformMatrix3Df.h"
 #include "FUiAnim_VisualElementCoordinateSystem.h"
 
-//#define OLD
 #define SUPPORT_CUSTOMIZING_ATTACH_DETACH_ANIMATION
 
 namespace Tizen { namespace Ui
@@ -1043,11 +1042,7 @@ private:
 
        void SetRootNeedsContentUpdate(void)
        {
-#ifdef OLD
-               if (unlikely(__childrenNeedsUpdateProps & HIERARCHY_PROPERTY_CONTENT))
-#else
                if (unlikely(GetSharedData().childrenInvalidated))
-#endif
                {
                        _RootVisualElement* pRoot = GetRootPublic();
                        if (likely(pRoot))
@@ -1271,16 +1266,8 @@ protected:
                HIERARCHY_PROPERTY_SHOWSTATE                    = 0x04,
                HIERARCHY_PROPERTY_CONTENTOPACITY               = 0x08,
                HIERARCHY_PROPERTY_NATIVENODE                   = HIERARCHY_PROPERTY_CONTENTOPACITY,
-#ifdef OLD
-               HIERARCHY_PROPERTY_SURFACE                              = 0x10, // only for presentation element
-               HIERARCHY_PROPERTY_CONTENT                              = 0x20,
-#endif
                HIERARCHY_PROPERTY_CONTENTBOUNDS                = 0x40,
-#ifdef OLD
-               HIERARCHY_PROPERTY_MASK                                 = 0x7F
-#else
                HIERARCHY_PROPERTY_MASK                                 = 0x4F
-#endif
        };
 
        int _zOrderGroup;
index 0a15fdc..6e1b1d5 100644 (file)
@@ -133,7 +133,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
-       virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
+       virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
index 3933ab5..93ed06e 100644 (file)
@@ -109,7 +109,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
index 010b3b5..68fe433 100644 (file)
@@ -149,7 +149,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
-       virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
+       virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityValueIncreased(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
index f8259ee..e7c5f50 100644 (file)
@@ -554,6 +554,7 @@ private:
        bool __internalFocus;
        bool __isDestroyed;
        IEditTextFilter* __pTextFilter;
+       Tizen::Graphics::FloatRectangle __previousBounds;
 }; // _Edit
 
 }}} // Tizen::Ui::Controls
index b07416a..f0f35f0 100644 (file)
@@ -323,6 +323,7 @@ public:
        Tizen::Ui::Animations::_VisualElement* GetTextVisualElement(void);
        bool IsBounded(void) const;
        void SetControlInitialBounds(Tizen::Graphics::FloatRectangle initBounds);
+       void SetControlInitialPosition(Tizen::Graphics::FloatPoint initPosition);
        bool IsUpdateInitialBounds(void);
        virtual Tizen::Graphics::Rectangle GetTextBounds(void) const;
        virtual Tizen::Graphics::FloatRectangle GetTextBoundsF(void) const;
@@ -548,6 +549,7 @@ private:
        static float __initialParentHeight;
        static float __clipboardHeight;
        static _EditFooterVisibleStatus __initialFooterVisibleStatus;
+       static bool __footerVisibleChanged;
 
        wchar_t __echoChar;
 
index 8ebac04..beddc06 100644 (file)
@@ -126,7 +126,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
index 1dfca3f..515d6e6 100644 (file)
@@ -195,7 +195,7 @@ private:
        static int __overlayAgentcount;
        static int __overlayAgentXvPortCount;
        static int __baseXvPort;
-       static bool __isPortGrapped[_OVERLAYAGENT_XV_PORT];
+       static bool __isPortGrabbed[_OVERLAYAGENT_XV_PORT];
 
        // staticutil variable
        static int __dstRectMinWidth;
index 11059a4..7906aa9 100644 (file)
@@ -107,6 +107,8 @@ public:
        virtual void UpdateClientBounds(const Tizen::Graphics::FloatDimension& size, Tizen::Graphics::FloatRectangle& clientBounds);
        virtual bool IsRotationSynchronized(void) const;
 
+       virtual void OnWindowStateChanged(void);
+
 // Accessor
 public:
        void SetColor(const Tizen::Graphics::Color& color);
index 2b57cc3..141202c 100644 (file)
@@ -122,7 +122,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
index fe91f2f..8ac41ec 100644 (file)
@@ -90,7 +90,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
index d0e6065..8a406c4 100644 (file)
@@ -140,7 +140,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
-       virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
+       virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
index 9ab6a56..7b801ff 100644 (file)
@@ -98,7 +98,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
-       virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
+       virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
        virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element){return true;}
index 7d1c351..c65ec4f 100644 (file)
@@ -208,7 +208,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element);
index d574661..690f0b2 100644 (file)
@@ -142,7 +142,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
index d636887..f48aa44 100644 (file)
@@ -100,7 +100,7 @@ public:
        bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
@@ -137,6 +137,7 @@ private:
        float __sideMargin;
        float __itemMargin;
        float __arrowMargin;
+       float __itemMaxWidth;
 
        Tizen::Graphics::Bitmap* __pBgBitmapCached;
        Tizen::Graphics::Bitmap* __pBgEffectBitmapCached;
index e58ae7d..9e1c2c5 100644 (file)
@@ -283,7 +283,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
@@ -320,6 +320,7 @@ private:
        void DrawItemBackground(void);
        void DrawSectionStyleBackground(void);
        void DrawSectionStyleBackgroundCover(void);
+       void DrawContextItemBackground(void);
        void DrawAnnexStyle(void);
        void DrawCheckBox(void);
        void DrawRadioBox(void);
@@ -354,6 +355,8 @@ private:
        result CreateOnOffButton(void);
        result CreateDetailButton(void);
 
+       _Label* GetLabelCore(Label* label);
+
 private:
        void* __pAppInfo;
        int __refCount;
@@ -381,7 +384,7 @@ private:
 
        _TableViewItemControl* __pItemDivider;
        _TableViewItemControl* __pItemTopDivider;
-       _Label* __pItemAnnex;
+       Label* __pItemAnnex;
        _TableViewItemControl* __pItemCover;
        _TableViewItemControl* __pItemAnnexLeftDivider;
        _TableViewItemControl* __pItemAnnexRightDivider;
@@ -396,13 +399,13 @@ private:
        bool __itemDividerEnabled;
 
        // Simple Item
-       _Label* __pSimpleItemText;
-       _Label* __pSimpleItemBitmap;
+       Label* __pSimpleItemText;
+       Label* __pSimpleItemBitmap;
        Tizen::Graphics::Color __simpleItemTextColor[6];
        int __simpleItemTextSize;
 
        // Section header, footer
-       _Label* __pHeaderFooterItemText;
+       Label* __pHeaderFooterItemText;
 
        _Label* __pDimLayer;
 
index 75e651f..205f5f8 100644 (file)
@@ -238,6 +238,7 @@ public:
        result ExpandGroup(int groupIndex, bool withAnimation);
        result CollapseGroup(int groupIndex, bool withAnimation);
        bool IsGroupExpanded(int groupIndex) const;
+       void StopExpandCollapseAnimation(void);
 
        result SetReorderMode(bool enabled);
 
index a782c0d..6c7a815 100644 (file)
 
 namespace Tizen { namespace Ui { namespace Controls
 {
-
-#define MAX_TOKEN_COUNT     100;
-const int ANIMATION_DURATION_BOUNDS = 167;
-const int ANIMATION_DURATION_OPACITY = 83;
-
 class _TokenEdit;
 
 class SineTimingFunction
@@ -74,7 +69,7 @@ public:
 
        Tizen::Base::String GetTokenAt(int index) const;
 
-       int GetTokenCount(void) const;
+       int GetTokenCount(bool isInvokedByApp = false) const;
 
        int GetSelectedTokenIndex(void) const;
 
@@ -262,6 +257,13 @@ private:
 
        int __trackTokenIndex;
 
+       bool __isAnimationInProgress;
+
+       static const int ANIMATION_DURATION_BOUNDS = 167;
+
+       static const int ANIMATION_DURATION_OPACITY = 83;
+
+
 };     // _TokenEditPresenter
 
 }}} // Tizen::Ui::Controls
index 112b4c4..c73980d 100644 (file)
@@ -154,8 +154,9 @@ public:
        void ResetFocus(void);
        void SortElements(void);
 
-       bool SetParent(const _AccessibilityContainer& parent);
+       bool SetParent(const _AccessibilityContainer* pParent);
        _AccessibilityContainer* GetParent(void) const;
+       _AccessibilityContainer* GetRootParent(void) const;
        void SetPriority(int level);
        int GetPriority(void);
        void SetEnableState(bool enabledState);
index 7a045c3..8af2a2f 100644 (file)
@@ -84,7 +84,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element);
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element);
index 0feb77a..adee9ce 100644 (file)
@@ -318,6 +318,8 @@ public:
        result SetBuilderBounds(_ControlOrientation orientation, const Tizen::Graphics::FloatRectangle& bounds);
        void UpdateBuilderBounds(const Tizen::Graphics::FloatRectangle& bounds);
        void UpdateBuilderSize(const Tizen::Graphics::FloatDimension& dimension);
+       void UpdateBuilderPosition(const Tizen::Graphics::FloatPoint& position);
+       _ControlOrientation GetUiBuilderOrientation(void) const;
 
 // Layout
        bool IsLayoutable(void) const;
index ae7e1e4..2010b9d 100644 (file)
@@ -49,7 +49,7 @@ public:
        _WindowImpl* GetCurrentFrame(void) const;
 
        void OnScreenRotated(int rotation);
-       OrientationStatus GetFormOrientationStatus(_ControlImpl *pControlImpl);
+       OrientationStatus GetFormOrientationStatus(const _ControlImpl *pControlImpl) const;
        OrientationStatus GetOrientationStatus(Orientation mode) const;
 
 private:
index 215d3b3..21ae3ae 100644 (file)
@@ -38,7 +38,7 @@ public:
        virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
        virtual bool OnAccessibilityFocusMovedPrevious(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
        virtual bool OnAccessibilityReadingElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
-       virtual bool OnAccessibilityReadedElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
+       virtual bool OnAccessibilityReadElement(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
        virtual bool OnAccessibilityFocusIn(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
        virtual bool OnAccessibilityFocusOut(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
        virtual bool OnAccessibilityActionPerformed(const _AccessibilityContainer& control, const _AccessibilityElement& element) = 0;
index a19dc5f..2c71c2f 100644 (file)
@@ -102,6 +102,43 @@ DECLARE_UI_CONFIG(CHECKBUTTON);
        DECLARE_IMAGE_CONFIG(DETAILED_ICON_SELECTED, 50);
        DECLARE_IMAGE_CONFIG(DETAILED_ICON_EFFECT_NORMAL, 51);
        DECLARE_IMAGE_CONFIG(DETAILED_ICON_EFFECT_PRESSED, 52);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 53);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_DISABLED, 54);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_PRESSED, 55);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_HIGHLIGHTED, 56);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_SELECTED, 57);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 58);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_PRESSED, 59);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 60);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_DISABLED, 61);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_PRESSED, 62);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_HIGHLIGHTED, 63);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_SELECTED, 64);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 65);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_PRESSED, 66);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 67);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_DISABLED, 68);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_PRESSED, 69);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_HIGHLIGHTED, 70);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_SELECTED, 71);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 72);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_PRESSED, 73);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 74);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_DISABLED, 75);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_PRESSED, 76);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_HIGHLIGHTED, 77);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_SELECTED, 78);
+
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 79);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_PRESSED, 80);
+
 //Dimension config
        DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1);
        DECLARE_DIMENSION_CONFIG(MIN_DIMENSION, 2);
index 421bedf..5909e9c 100644 (file)
@@ -59,6 +59,14 @@ DECLARE_UI_CONFIG(EDIT);
        DECLARE_IMAGE_CONFIG(BG_ROUND_EFFECT, 14)
        DECLARE_IMAGE_CONFIG(CLEAR_ICON_NORMAL, 15)
        DECLARE_IMAGE_CONFIG(CLEAR_ICON_PRESSED, 16)
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 17)
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 18)
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 19)
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 20)
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 21)
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 22)
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 23)
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 24)
 
        DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1)
        DECLARE_DIMENSION_CONFIG(TITLE_STYLE_MIN_SIZE, 2)
index 712cb73..319ab5e 100644 (file)
@@ -51,6 +51,14 @@ DECLARE_UI_CONFIG(SLIDER);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, 12);
        DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, 13);
        DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, 14);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 15);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 16);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 17);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 18);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 19);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 20);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 21);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 22);
        DECLARE_SHAPE_CONFIG(HANDLE_WIDTH, 1);
        DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 2);
        DECLARE_SHAPE_CONFIG(HANDLE_OFFSET, 3);
index 3cc67dc..7354cc9 100644 (file)
@@ -125,6 +125,8 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(SECTIONITEM_TOP_BG_DISABLED, 60);
        DECLARE_IMAGE_CONFIG(SECTIONITEM_CENTER_BG_DISABLED, 61);
        DECLARE_IMAGE_CONFIG(SECTIONITEM_BOTTOM_BG_DISABLED, 62);
+       DECLARE_IMAGE_CONFIG(QUICK_MENU_BG_NORMAL, 63);
+       DECLARE_IMAGE_CONFIG(QUICK_MENU_BG_EFFECT, 64);
 
        DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1);
        DECLARE_SHAPE_CONFIG(ITEM_DEFAULT_FONT_SIZE, 1);
index 7c54b82..89e2b65 100644 (file)
@@ -100,7 +100,7 @@ public:
        virtual result OnDetachingFromMainTree(void);
        virtual void OnFocusableStateChanged(bool focusalbeState);
 #if defined(WINDOW_BASE_ROTATE)
-       void OnWindowStateChanged(void);
+       virtual void OnWindowStateChanged(void);
        void SetPreferredRotation(bool enable);
        bool GetPreferredRotation(void) const;
 #if defined(WINDOW_OWNEE_PREFERRED)
@@ -136,6 +136,9 @@ public:
        void SetDimmingLayer(_DimmingLayer* pLayer);
        _DimmingLayer* GetDimmingLayer(void);
 
+       void SetOrientationCallbackModeEnabled(bool enable);
+       bool IsOrientationCallbackModeEnabled(void) const;
+
 protected:
        _Window(void);
        _IWindowDelegate& GetWindowDelegate(void) const;
@@ -183,6 +186,8 @@ private:
        bool __preferredRotation;
 #endif
 
+       bool __orientationCallbackMode;
+
        friend class _ControlManager;
 }; // _Window
 
index c674a60..904581d 100644 (file)
@@ -120,6 +120,42 @@ START_UI_CONFIG(CHECKBUTTON);
        ADD_IMAGE_CONFIG(DETAILED_ICON_EFFECT_NORMAL, # #00_button_right_ef.png); //not supported by theme
        ADD_IMAGE_CONFIG(DETAILED_ICON_EFFECT_PRESSED, # #00_button_right_ef.png); //not supported by theme
 
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, #00_list_group_bg.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_DISABLED, #00_list_group_bg.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_PRESSED, #00_list_group_bg.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_HIGHLIGHTED, #00_groupedlist_bg_focus.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_SELECTED, #00_list_group_bg.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, #00_list_group_bg_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_PRESSED, #00_list_group_bg_ef.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_list_group_bg_top.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_DISABLED, #00_list_group_bg_top.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_PRESSED, #00_list_group_bg_top.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_HIGHLIGHTED, #00_groupedlist_top_bg_focus.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_SELECTED, #00_list_group_bg_top.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, #00_list_group_bg_top_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_PRESSED, #00_list_group_bg_top_ef.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, #00_list_group_bg_center.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_DISABLED, #00_list_group_bg_center.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_PRESSED, #00_list_group_bg_center.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_HIGHLIGHTED, #00_groupedlist_center_bg_focus.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_SELECTED, #00_list_group_bg_center.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, #00_list_group_bg_center_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_PRESSED, #00_list_group_bg_center_ef.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, #00_list_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_DISABLED, #00_list_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_PRESSED, #00_list_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_HIGHLIGHTED, #00_groupedlist_bottom_bg_focus.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_SELECTED, #00_list_group_bg_bottom.#.png);
+
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, #00_list_group_bg_bottom_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_PRESSED, #00_list_group_bg_bottom_ef.#.png);
+
        START_UI_CONFIG_MODE(480x800);
                ADD_DIMENSION_CONFIG(MIN_SIZE, 0, 0);
        END_UI_CONFIG_MODE(480x800);
index 022cbe4..c73b75e 100644 (file)
@@ -654,11 +654,14 @@ ConfigParser::AddImage(const xmlChar** pAttributes)
                                        if (__pMapContainer->GetImageMap()->GetValue(resourceKey, pItem) == E_SUCCESS)
                                        {
                                                int len = ((char*) pAttributes[i]+1 != null) ? mbstowcs(null, (char*) pAttributes[i]+1, 0) : 0;
-                                               wchar_t* pValue = new (std::nothrow) wchar_t [len +1];
-                                               len = mbstowcs(pValue, (char*) pAttributes[i]+1, len);
-                                               pValue[len] = '\0';
-                                               pItem->SetImageFileName(pValue);
-                                               __pMapContainer->GetImageMap()->ChangeValue(resourceKey, pItem);
+                                               if(len > 0)
+                                               {
+                                                       wchar_t* pValue = new (std::nothrow) wchar_t [len +1];
+                                                       len = mbstowcs(pValue, (char*) pAttributes[i]+1, len);
+                                                       pValue[len] = '\0';
+                                                       pItem->SetImageFileName(pValue);
+                                                       __pMapContainer->GetImageMap()->ChangeValue(resourceKey, pItem);
+                                               }
                                        }
                                        else
                                        {
@@ -722,8 +725,11 @@ ConfigParser::AddAnimationFrame(const xmlChar** pAttributes)
                {
                        if (xmlStrcasecmp(pAttributes[i], (xmlChar*) "Image") == 0)
                        {
-                               fileName = (char*) pAttributes[++i];
-                               fileName.SubString(1, fileName);
+                               int len = ((char*) pAttributes[i+1]+1 != null) ? mbstowcs(null, (char*) pAttributes[i+1]+1, 0) : 0;
+                               if(len > 0)
+                               {
+                                       fileName = (char*) pAttributes[++i]+1;
+                               }
                        }
                        if (xmlStrcasecmp(pAttributes[i], (xmlChar*) "Duration") == 0)
                        {
@@ -1026,6 +1032,86 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::DETAILED_ICON_SELECTED_IMAGE);
                }
                {
+                       const char* key ="CHECKBUTTON::GROUPED_SINGLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_SINGLE_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_SINGLE_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_SINGLE_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_SINGLE_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_SINGLE_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_SINGLE_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_SINGLE_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_SINGLE_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_SINGLE_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_TOP_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_TOP_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_TOP_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_TOP_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_TOP_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_TOP_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_TOP_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_TOP_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_TOP_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_TOP_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_MIDDLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_MIDDLE_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_MIDDLE_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_MIDDLE_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_MIDDLE_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_MIDDLE_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_MIDDLE_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_MIDDLE_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_MIDDLE_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_MIDDLE_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_BOTTOM_BG_NORMAL";
+                               __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_BOTTOM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_BOTTOM_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_BOTTOM_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_BOTTOM_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_BOTTOM_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_BOTTOM_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_BOTTOM_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="CHECKBUTTON::GROUPED_BOTTOM_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _CHECKBUTTON::GROUPED_BOTTOM_BG_SELECTED_IMAGE);
+               }
+               {
                        const char* key ="COLORPICKER::ARROW_BUTTON_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _COLORPICKER::ARROW_BUTTON_BG_NORMAL_IMAGE);
                }
@@ -1130,6 +1216,38 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _EDIT::CLEAR_ICON_PRESSED_IMAGE);
                }
                {
+                       const char* key ="EDIT::GROUPED_SINGLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_SINGLE_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_SINGLE_BG_EFFECT_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_SINGLE_BG_EFFECT_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_TOP_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_TOP_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_TOP_BG_EFFECT_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_TOP_BG_EFFECT_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_MIDDLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_MIDDLE_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_MIDDLE_BG_EFFECT_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_MIDDLE_BG_EFFECT_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_BOTTOM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_BOTTOM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="EDIT::GROUPED_BOTTOM_BG_EFFECT_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _EDIT::GROUPED_BOTTOM_BG_EFFECT_NORMAL_IMAGE);
+               }
+               {
                        const char* key ="EDITDATE::CONTENT_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_NORMAL_IMAGE);
                }
@@ -1798,6 +1916,22 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
                }
                {
+                       const char* key ="SLIDER::GROUPED_TOP_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_TOP_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="SLIDER::GROUPED_MIDDLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_MIDDLE_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="SLIDER::GROUPED_BOTTOM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_BOTTOM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="SLIDER::GROUPED_SINGLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_SINGLE_BG_NORMAL_IMAGE);
+               }
+               {
                        const char* key ="SPLITPANEL::DIVIDER_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _SPLITPANEL::DIVIDER_BG_NORMAL_IMAGE);
                }
index 0e75d6e..aeeee50 100644 (file)
@@ -58,6 +58,14 @@ START_UI_CONFIG(EDIT);
        ADD_IMAGE_CONFIG(BG_ROUND_EFFECT, #00_edit_field_line_round_bg_01.#.png);
        ADD_IMAGE_CONFIG(CLEAR_ICON_NORMAL, #00_edit_field_clear.png);
        ADD_IMAGE_CONFIG(CLEAR_ICON_PRESSED, #00_edit_field_clear.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, #00_edit_group_bg.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, #00_edit_group_bg_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_edit_group_bg_top.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, #00_edit_group_bg_top_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, #00_edit_group_bg_center.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, #00_edit_group_bg_center_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, #00_edit_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, #00_edit_group_bg_bottom_ef.#.png);
 
        START_UI_CONFIG_MODE(480x800);
 
index 3b30432..f46fb61 100644 (file)
@@ -60,6 +60,15 @@ START_UI_CONFIG(SLIDER);
        ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
        ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bg_ef.#.png);
 
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_list_group_bg_top.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, #00_list_group_bg_center.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, #00_list_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, #00_list_group_bg_top_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, #00_list_group_bg_center_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, #00_list_group_bg_bottom_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, #00_list_group_bg.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, #00_list_group_bg_ef.#.png);
+
        START_UI_CONFIG_MODE(720x1280);
        {
                ADD_SHAPE_CONFIG(HANDLE_WIDTH, 72);
index 38e2099..2016352 100644 (file)
@@ -121,6 +121,8 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(SECTIONITEM_TOP_BG_DISABLED, #00_list_group_bg_top.#.png);
        ADD_IMAGE_CONFIG(SECTIONITEM_CENTER_BG_DISABLED, #00_list_group_bg_center.#.png);
        ADD_IMAGE_CONFIG(SECTIONITEM_BOTTOM_BG_DISABLED, #00_list_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(QUICK_MENU_BG_NORMAL, #00_quick_menu_bg.#.png);
+       ADD_IMAGE_CONFIG(QUICK_MENU_BG_EFFECT, #00_quick_menu_bg_ef.#.png);
 
 
 
index c09560c..74cb70c 100644 (file)
@@ -940,7 +940,7 @@ _SceneManagerImpl::OnAnimationTransactionStopped(int transactionId)
 void
 _SceneManagerImpl::OnSceneControlEventReceived(_SceneControlEventArg::SceneControlEventType eventType, const SceneId& sceneId)
 {
-       SysLog(NID_UI_SCENES, "Received type= 0x%x, sceneId=%ls", eventType, &sceneId);
+       SysSecureLog(NID_UI_SCENES, "Received type= 0x%x, sceneId=%ls", eventType, sceneId.GetPointer());
 
        switch (eventType)
        {
@@ -1537,8 +1537,16 @@ _SceneManagerImpl::SetCurrentForm(Form& form, bool useAnimator)
                SysLog(NID_UI_SCENES, "Safety operation ongoing. Animation may not working, Please check the problems!");
        }
 
-       r = pFrame->SetCurrentForm(form);
-       SysTryReturnResult(NID_UI_SCENES, !IsFailed(r), E_SYSTEM, "A system error has been occurred. Can not set current form.");
+       // Check the current Form, if already current one then skip the SetCurrentForm().
+       if (GetCurrentForm() == &form)
+       {
+               SysSecureLog(NID_UI_SCENES, "The Form already set as current form, skip the SetCurrentForm()");
+       }
+       else
+       {
+               r = pFrame->SetCurrentForm(form);
+               SysTryReturnResult(NID_UI_SCENES, !IsFailed(r), E_SYSTEM, "A system error has been occurred. Can not set current form.");
+       }
        return E_SUCCESS;
 }