From 728777734806b9f8a33c67d9a7ae953f168ca1a2 Mon Sep 17 00:00:00 2001 From: SeungwanWoo Date: Wed, 27 Mar 2013 04:04:10 +0900 Subject: [PATCH] Revert "reset commit to request SR" This reverts commit ee98ab3b533e64ff8ca3c17e5b3de651cdd63ad7 --- .../usr/share/osp/bitmaps/480x800/00_focus.#.png | Bin 2925 -> 0 bytes .../bitmaps/480x800/00_groupedlist_bg_focus.#.png | Bin .../480x800/00_groupedlist_bottom_bg_focus.#.png | Bin .../480x800/00_groupedlist_center_bg_focus.#.png | Bin .../480x800/00_groupedlist_top_bg_focus.#.png | Bin .../osp/bitmaps/480x800/00_list_group_bg.#.png | Bin .../bitmaps/480x800/00_list_group_bg_bottom.#.png | Bin .../{white => }/00_list_group_bg_bottom_ef.#.png | Bin .../bitmaps/480x800/00_list_group_bg_center.#.png | Bin .../{white => }/00_list_group_bg_center_ef.#.png | Bin .../480x800/{white => }/00_list_group_bg_ef.#.png | Bin .../osp/bitmaps/480x800/00_list_group_bg_top.#.png | Bin .../{white => }/00_list_group_bg_top_ef.#.png | Bin .../share/osp/bitmaps/480x800/black/00_focus.#.png | Bin 2925 -> 0 bytes .../480x800/black/00_list_group_bg_bottom_ef.#.png | Bin 3052 -> 0 bytes .../480x800/black/00_list_group_bg_center_ef.#.png | Bin 2954 -> 0 bytes .../480x800/black/00_list_group_bg_ef.#.png | Bin 3104 -> 0 bytes .../share/osp/bitmaps/480x800/white/00_focus.#.png | Bin 2925 -> 0 bytes .../usr/share/osp/bitmaps/720x1280/00_focus.#.png | Bin 3012 -> 0 bytes .../bitmaps/720x1280/00_groupedlist_bg_focus.#.png | Bin .../720x1280/00_groupedlist_bottom_bg_focus.#.png | Bin .../720x1280/00_groupedlist_center_bg_focus.#.png | Bin .../720x1280/00_groupedlist_top_bg_focus.#.png | Bin .../osp/bitmaps/720x1280/00_list_group_bg.#.png | Bin .../bitmaps/720x1280/00_list_group_bg_bottom.#.png | Bin .../{white => }/00_list_group_bg_bottom_ef.#.png | Bin .../bitmaps/720x1280/00_list_group_bg_center.#.png | Bin .../{white => }/00_list_group_bg_center_ef.#.png | Bin .../720x1280/{white => }/00_list_group_bg_ef.#.png | Bin .../bitmaps/720x1280/00_list_group_bg_top.#.png | Bin .../00_list_group_bg_top_ef.#.png | Bin 3076 -> 3150 bytes .../osp/bitmaps/720x1280/black/00_focus.#.png | Bin 3012 -> 0 bytes .../black/00_list_group_bg_bottom_ef.#.png | Bin 3156 -> 0 bytes .../black/00_list_group_bg_center_ef.#.png | Bin 2891 -> 0 bytes .../720x1280/black/00_list_group_bg_ef.#.png | Bin 3152 -> 0 bytes .../720x1280/black/00_list_group_bg_top_ef.#.png | Bin 3146 -> 0 bytes .../osp/bitmaps/720x1280/white/00_focus.#.png | Bin 3012 -> 0 bytes .../720x1280/white/00_list_group_bg_top_ef.#.png | Bin 3138 -> 0 bytes src/graphics/FGrp_Canvas.cpp | 11 +- src/graphics/FGrp_CanvasImpl.cpp | 2 +- src/graphics/FGrp_FontImpl.cpp | 2 +- src/graphics/FGrp_FontUtil.h | 6 +- src/ui/CMakeLists.txt | 1 - src/ui/FUi_ContainerImpl.cpp | 53 +- src/ui/FUi_Control.cpp | 94 +-- src/ui/animations/FUiAnim_AnimationManager.cpp | 6 - src/ui/controls/FUiCtrl_ButtonPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_DateTimeBar.cpp | 68 +- src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp | 10 +- src/ui/controls/FUiCtrl_Edit.cpp | 14 + src/ui/controls/FUiCtrl_EditDate.cpp | 2 - src/ui/controls/FUiCtrl_EditDatePresenter.cpp | 42 +- src/ui/controls/FUiCtrl_EditPresenter.cpp | 30 + src/ui/controls/FUiCtrl_EditTime.cpp | 2 - src/ui/controls/FUiCtrl_EditTimePresenter.cpp | 62 +- src/ui/controls/FUiCtrl_Form.cpp | 83 ++- src/ui/controls/FUiCtrl_IconListPresenter.cpp | 4 +- src/ui/controls/FUiCtrl_Popup.cpp | 29 - src/ui/controls/FUiCtrl_SearchBar.cpp | 18 +- .../controls/FUiCtrl_SlidableGroupedListImpl.cpp | 139 ++-- src/ui/controls/FUiCtrl_SliderPresenter.cpp | 114 ++-- src/ui/controls/FUiCtrl_SplitPanel.cpp | 202 ++---- src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp | 746 +++++++++------------ src/ui/controls/FUiCtrl_TableViewItem.cpp | 257 +++---- src/ui/controls/FUiCtrl_TableViewPresenter.cpp | 7 +- src/ui/controls/FUiCtrl_TokenEditPresenter.cpp | 138 ++-- src/ui/controls/FUiCtrl_Toolbar.cpp | 29 +- src/ui/inc/FUiCtrl_DateTimeBar.h | 4 +- src/ui/inc/FUiCtrl_DateTimeBarPresenter.h | 2 +- src/ui/inc/FUiCtrl_Edit.h | 2 + src/ui/inc/FUiCtrl_EditPresenter.h | 5 +- src/ui/inc/FUiCtrl_Form.h | 2 + src/ui/inc/FUiCtrl_Popup.h | 1 - src/ui/inc/FUiCtrl_SearchBar.h | 1 - src/ui/inc/FUiCtrl_SlidableGroupedListImpl.h | 1 - src/ui/inc/FUiCtrl_SliderPresenter.h | 13 +- src/ui/inc/FUiCtrl_SplitPanel.h | 6 +- src/ui/inc/FUiCtrl_SplitPanelPresenter.h | 8 +- src/ui/inc/FUiCtrl_TableViewItem.h | 7 +- src/ui/inc/FUiCtrl_TokenEditPresenter.h | 6 +- src/ui/inc/FUi_ContainerImpl.h | 1 - src/ui/inc/FUi_Control.h | 15 +- src/ui/layout/FUi_LayoutLayoutContainer.cpp | 11 +- src/ui/layout/FUi_LayoutLayoutItem.cpp | 25 +- src/ui/layout/FUi_LayoutLayoutItemProxy.cpp | 3 +- src/ui/resource/FUi_ResourceFocusUiConfig.cpp | 25 - src/ui/resource/FUi_ResourceFooterConfig.cpp | 2 +- src/ui/resource/FUi_ResourceSearchBarConfig.cpp | 5 +- 88 files changed, 936 insertions(+), 1384 deletions(-) delete mode 100644 res/common/usr/share/osp/bitmaps/480x800/00_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_bottom_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_center_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_top_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_bottom.#.png rename res/common/usr/share/osp/bitmaps/480x800/{white => }/00_list_group_bg_bottom_ef.#.png (100%) mode change 100644 => 100755 mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_center.#.png rename res/common/usr/share/osp/bitmaps/480x800/{white => }/00_list_group_bg_center_ef.#.png (100%) mode change 100644 => 100755 rename res/common/usr/share/osp/bitmaps/480x800/{white => }/00_list_group_bg_ef.#.png (100%) mode change 100644 => 100755 mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_top.#.png rename res/common/usr/share/osp/bitmaps/480x800/{white => }/00_list_group_bg_top_ef.#.png (100%) mode change 100644 => 100755 delete mode 100644 res/common/usr/share/osp/bitmaps/480x800/black/00_focus.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_bottom_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_center_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/480x800/white/00_focus.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/00_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_groupedlist_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_groupedlist_bottom_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_groupedlist_center_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_groupedlist_top_bg_focus.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg.#.png mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_bottom.#.png rename res/common/usr/share/osp/bitmaps/720x1280/{white => }/00_list_group_bg_bottom_ef.#.png (100%) mode change 100644 => 100755 mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_center.#.png rename res/common/usr/share/osp/bitmaps/720x1280/{white => }/00_list_group_bg_center_ef.#.png (100%) mode change 100644 => 100755 rename res/common/usr/share/osp/bitmaps/720x1280/{white => }/00_list_group_bg_ef.#.png (100%) mode change 100644 => 100755 mode change 100644 => 100755 res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top.#.png rename res/common/usr/share/osp/bitmaps/{480x800/black => 720x1280}/00_list_group_bg_top_ef.#.png (85%) delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/black/00_focus.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_center_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/white/00_focus.#.png delete mode 100644 res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png mode change 100755 => 100644 src/graphics/FGrp_Canvas.cpp mode change 100644 => 100755 src/ui/controls/FUiCtrl_SliderPresenter.cpp mode change 100755 => 100644 src/ui/layout/FUi_LayoutLayoutContainer.cpp mode change 100755 => 100644 src/ui/layout/FUi_LayoutLayoutItem.cpp mode change 100755 => 100644 src/ui/layout/FUi_LayoutLayoutItemProxy.cpp delete mode 100644 src/ui/resource/FUi_ResourceFocusUiConfig.cpp diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_focus.#.png deleted file mode 100644 index 6327ca2ee461b84fcb291e25f243090c62832b99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2925 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 X86652u_xYw00000NkvXXu0mjfiOy&7 diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_bg_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_bg_focus.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_bottom_bg_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_bottom_bg_focus.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_center_bg_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_center_bg_focus.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_top_bg_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_groupedlist_top_bg_focus.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_bottom.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_bottom.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_bottom_ef.#.png old mode 100644 new mode 100755 similarity index 100% rename from res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_bottom_ef.#.png rename to res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_bottom_ef.#.png diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_center.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_center.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_center_ef.#.png old mode 100644 new mode 100755 similarity index 100% rename from res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_center_ef.#.png rename to res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_center_ef.#.png diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_ef.#.png old mode 100644 new mode 100755 similarity index 100% rename from res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_ef.#.png rename to res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_ef.#.png diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_top.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_top.#.png old mode 100644 new mode 100755 diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_top_ef.#.png old mode 100644 new mode 100755 similarity index 100% rename from res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_top_ef.#.png rename to res/common/usr/share/osp/bitmaps/480x800/00_list_group_bg_top_ef.#.png diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_focus.#.png deleted file mode 100644 index 6327ca2ee461b84fcb291e25f243090c62832b99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2925 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 X86652u_xYw00000NkvXXu0mjfiOy&7 diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_bottom_ef.#.png deleted file mode 100644 index c2d4df9debe4ad7fb312037b2e322394f59ebc73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3052 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 X86652u_xYw00000NkvXXu0mjfiOy&7 diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_focus.#.png deleted file mode 100644 index 4b7603a61a1a8c549e3ac4a68a2f6a88284af444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3012 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 Hu0mjf-VVgB delta 390 zcmV;10eSw;7=#!$iBL{Q4GJ0x0000DNk~Le0000Q0000E2nGNE05J^=LjV8(32;bR za{vGf6951U69E94oEWh-iVA-(NklP5JaT-IEwWlw5II~Xrz0ol90`KXi^J;v@!iJ1G_u(&Hl`;s4AOEL;&&x*(5j1 zSsp$=JLTf?$_J{}&MO~bNSdY;kuiq7MuS?d{snvjk%(yCl^@4(WAuM`uan8^0wnoq zd|L^iUbA^nJv?fO@B5*ML|(RAeHuOJbQ;W4mqzVQwv kz5YPAwNBO+b}9KD0K{&D?pO$X-2eap07*qoM6N<$f?N!wQ2+n{ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_focus.#.png deleted file mode 100644 index 4b7603a61a1a8c549e3ac4a68a2f6a88284af444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3012 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 diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_focus.#.png deleted file mode 100644 index 4b7603a61a1a8c549e3ac4a68a2f6a88284af444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3012 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 diff --git a/src/graphics/FGrp_Canvas.cpp b/src/graphics/FGrp_Canvas.cpp old mode 100755 new mode 100644 index e9f7bd2..05268d2 --- a/src/graphics/FGrp_Canvas.cpp +++ b/src/graphics/FGrp_Canvas.cpp @@ -1507,15 +1507,8 @@ _Canvas::DrawBitmap(const Point& point, const _Bitmap& bitmap) } } { - bool isPixmanSupported = (!this->__useStableRenderer) && (alphaConstant >= 255); - - if (isPixmanSupported) - { - Color color; - - isPixmanSupported = !((bitmap.GetBitsPerPixel() == 16) && (bitmap.GetMaskingColor(color) == E_SUCCESS)); - } - + Color color; + bool isPixmanSupported = !this->__useStableRenderer && bitmap.GetMaskingColor(color ) != E_SUCCESS && alphaConstant >= 255; if (isPixmanSupported) { _Util::Rectangle outRect = { 0, 0, -1, -1 }; diff --git a/src/graphics/FGrp_CanvasImpl.cpp b/src/graphics/FGrp_CanvasImpl.cpp index 427c24f..b05fdd0 100755 --- a/src/graphics/FGrp_CanvasImpl.cpp +++ b/src/graphics/FGrp_CanvasImpl.cpp @@ -47,7 +47,7 @@ using namespace Tizen::Base::Collection; #define EXTRACT_CANVASEX(pVar, canvas) Tizen::Graphics::_Canvas * pVar = canvas._pNativeCanvas #define EXTRACT_BITMAPEX(pVar, bitmap) Tizen::Graphics::_Bitmap * pVar = Tizen::Graphics::_GetBitmapEx(bitmap) -#define EXTRACT_FONTEX(pVar, font) Tizen::Graphics::_Font * pVar = Tizen::Graphics::_GetFontEx(font) +#define EXTRACT_FONTEX(pVar, font) Tizen::Graphics::_Font * pVar = Tizen::Graphics::GetFontEx(font) #define EXTRACT_SCALED_BITMAPEX(pVar, bitmap) Tizen::Graphics::_Bitmap * pVar = Tizen::Graphics::_GetScaledBitmapEx(bitmap) #define IsSucceeded(X) (!IsFailed(X)) diff --git a/src/graphics/FGrp_FontImpl.cpp b/src/graphics/FGrp_FontImpl.cpp index 69412a3..58e76a5 100644 --- a/src/graphics/FGrp_FontImpl.cpp +++ b/src/graphics/FGrp_FontImpl.cpp @@ -819,7 +819,7 @@ namespace Tizen { namespace Graphics { _OSP_EXPORT_ bool _TestGetTextExtentList(Tizen::Graphics::Font& font, const Tizen::Base::String& string, std::vector >& outList) { - _Font* pInternalFont = _GetFontEx(font); + _Font* pInternalFont = GetFontEx(font); _Util::String text(string.GetPointer(), string.GetLength()); _Util::AccumList<_Util::Pair > outAccumList; diff --git a/src/graphics/FGrp_FontUtil.h b/src/graphics/FGrp_FontUtil.h index efddede..cada4bd 100644 --- a/src/graphics/FGrp_FontUtil.h +++ b/src/graphics/FGrp_FontUtil.h @@ -44,17 +44,17 @@ public: }; inline _Font* -_GetFontEx(const Tizen::Graphics::_FontImpl& font) +GetFontEx(const Tizen::Graphics::_FontImpl& font) { const _FontImplHack* pFontImplHack = static_cast (&font); return (pFontImplHack) ? pFontImplHack->GetFontEx() : null; } inline _Font* -_GetFontEx(const Tizen::Graphics::Font& font) +GetFontEx(const Tizen::Graphics::Font& font) { const _FontImpl* pFontImpl = _FontImpl::GetInstance(font); - return (pFontImpl) ? _GetFontEx(*pFontImpl) : null; + return (pFontImpl) ? GetFontEx(*pFontImpl) : null; } }} // Tizen::Graphics diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index f475585..0413dad 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -649,7 +649,6 @@ SET (${this_target}_SOURCE_FILES resource/FUi_ResourceStringLoader.cpp resource/FUi_ResourceConfigLoader.cpp resource/FUi_ResourceConfigParser.cpp - resource/FUi_ResourceFocusUiConfig.cpp ## EFFECTS effects/FUiEffects_EffectErrorMessages.cpp effects/FUiEffects_EffectManagerImpl.cpp diff --git a/src/ui/FUi_ContainerImpl.cpp b/src/ui/FUi_ContainerImpl.cpp index f7ff60e..b4c13a0 100644 --- a/src/ui/FUi_ContainerImpl.cpp +++ b/src/ui/FUi_ContainerImpl.cpp @@ -246,54 +246,6 @@ _ContainerImpl::RemoveChild(int index) } void -_ContainerImpl::DeleteAllChildren(_ContainerImpl* pChild, bool detachSystemChild) -{ - ArrayList* pList = static_cast (pChild->GetChildrenPublic()); - int count = pList->GetCount(); - for (int index = 0; index < count; index++) - { - Container* pContainer = dynamic_cast (pList->GetAt(index)); - result r = GetLastResult(); - if (IsFailed(r)) - { - SysAssert(r == E_OUT_OF_RANGE); - SysLogException(NID_UI, - E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The specified index is out of range (index = %d, count = %d.)", - index, GetChildCount()); - return; - } - - if (pContainer) - { - _ContainerImpl* pContainerImpl = _ContainerImpl::GetInstance(*pContainer); - DeleteAllChildren(pContainerImpl, detachSystemChild); - pContainer->Destroy(); - } - else - { - Control* pControl = static_cast (pList->GetAt(index)); - result r = GetLastResult(); - if (IsFailed(r)) - { - SysAssert(r == E_OUT_OF_RANGE); - SysLogException(NID_UI, - E_OUT_OF_RANGE, "[E_OUT_OF_RANGE] The specified index is out of range (index = %d, count = %d.)", - index, GetChildCount()); - return; - } - _ControlImpl* pControlImpl = _ControlImpl::GetInstance(*pControl); - if (pControlImpl) - { - if (detachSystemChild || pControlImpl->GetCore().GetArea() != _CONTROL_AREA_SYSTEM) - { - pControl->Destroy(); - } - } - } - } -} - -void _ContainerImpl::RemoveAllChildren(bool detachSystemChild) { ClearLastResult(); @@ -301,11 +253,10 @@ _ContainerImpl::RemoveAllChildren(bool detachSystemChild) GetCore().DetachAllChildren(detachSystemChild); SysAssert(GetLastResult() == E_SUCCESS); - DeleteAllChildren(this, detachSystemChild); if (detachSystemChild) { - __controlPublics.RemoveAll(false); + __controlPublics.RemoveAll(true); } else { @@ -321,7 +272,7 @@ _ContainerImpl::RemoveAllChildren(bool detachSystemChild) continue; } - r = __controlPublics.Remove(pControl->GetPublic(), false); + r = __controlPublics.Remove(pControl->GetPublic(), true); SysAssert(r == E_SUCCESS); } } diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp index 890dd2f..8fc1cfa 100644 --- a/src/ui/FUi_Control.cpp +++ b/src/ui/FUi_Control.cpp @@ -52,7 +52,6 @@ #include "FUiAnim_VisualElementImpl.h" #include "FUiCtrl_Form.h" #include "FUiCtrl_Frame.h" -#include "FUi_ContainerImpl.h" using namespace std; using namespace Tizen::Base; @@ -3666,11 +3665,6 @@ _Control::DisposeControl(void) delete __pAccessibilityContainer; __pAccessibilityContainer = null; - - if (__pFocusVisualElement) - { - __pFocusVisualElement.release(); - } } // E_OUT_OF_MEMORY @@ -4924,7 +4918,7 @@ _Control::OnDrawFocus(void) pCanvas->SetBackgroundColor(0x55555555); pCanvas->Clear(); Bitmap* pBitmap = null; - result r = GET_BITMAP_CONFIG_N(FOCUSUI::FOCUS, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); + result r = GET_BITMAP_CONFIG_N(ACCESSIBILITY::POPUP_BG, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap); if (r == E_SUCCESS) { @@ -4987,90 +4981,4 @@ _Control::DrawFocus(void) _IControlDelegate& delegate = GetControlDelegate(); delegate.OnDrawFocus(); } - -void -_Control::MakeFocusList(const _Control* pControl, IListT<_Control*>* pFocusControlList) const -{ - int childCount = pControl->GetChildCount(); - for(int i = 0; i < childCount; i++) - { - _Control* pChildControl = pControl->GetChild(i); - Rectangle rect = pChildControl->GetAbsoluteBounds(); - unique_ptr > pEnum (pFocusControlList->GetEnumeratorN()); - int index = 0; - while (pEnum->MoveNext() == E_SUCCESS) - { - _Control* pEnumeratorControl = null; - pEnum->GetCurrent(pEnumeratorControl); - if (pEnumeratorControl != null) - { - Rectangle enumeratorRect = pEnumeratorControl->GetAbsoluteBounds(); - if(enumeratorRect.y > rect.y) - { - break; - } - else if (enumeratorRect.y == rect.y) - { - if(enumeratorRect.x > rect.x) - { - break; - } - } - - index ++; - } - } - pFocusControlList->InsertAt(pChildControl, index); - } -} - -void -_Control::MakeChildContainerFocusList(const _Control* pControl, int startIndex , IListT<_Control*>* pFocusControlList) const -{ - unique_ptr > pTempList (new (std::nothrow) ArrayListT<_Control*>); - SysTryReturnVoidResult(NID_UI_CTRL, pTempList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient."); - MakeFocusList(pControl, pTempList.get()); - - unique_ptr > pTempEnum(pTempList->GetEnumeratorN()); - int index = ++startIndex; - while (pTempEnum->MoveNext() == E_SUCCESS) - { - _Control* pEnumeratorControl = null; - pTempEnum->GetCurrent(pEnumeratorControl); - pFocusControlList->InsertAt(pEnumeratorControl, index); - index ++; - } -} - -Tizen::Base::Collection::IListT<_Control*>* -_Control::GetFocusListN(void) const -{ - unique_ptr > pControlFocusList (new (std::nothrow) ArrayListT<_Control*>); - SysTryReturn(NID_UI_CTRL, pControlFocusList, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - MakeFocusList(this, pControlFocusList.get()); - - unique_ptr > pEnum(pControlFocusList->GetEnumeratorN()); - SysTryReturn(NID_UI_CTRL, pEnum, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); - int i =0; - int nextContainerIndex = -1; - while (pEnum->MoveNext() == E_SUCCESS) - { - _Control* pEnumeratorControl = null; - pEnum->GetCurrent(pEnumeratorControl); - _ContainerImpl* pTempContainerImpl = dynamic_cast<_ContainerImpl*>(static_cast <_ControlImpl* >(pEnumeratorControl->GetUserData())); - - if (pTempContainerImpl != null && (nextContainerIndex < i)) - { - if (pEnumeratorControl->IsChildControlFocusManage() == false) - { - MakeChildContainerFocusList(pEnumeratorControl, i, pControlFocusList.get()); - nextContainerIndex = i; - pEnum.reset(pControlFocusList->GetEnumeratorN()); - i = -1; - } - } - i++; - } - return pControlFocusList.release(); -} }} // Tizen::Ui diff --git a/src/ui/animations/FUiAnim_AnimationManager.cpp b/src/ui/animations/FUiAnim_AnimationManager.cpp index f328521..494824d 100644 --- a/src/ui/animations/FUiAnim_AnimationManager.cpp +++ b/src/ui/animations/FUiAnim_AnimationManager.cpp @@ -744,12 +744,6 @@ _AnimationManager::IsImplicitAnimationEnabled(void) const _TransactionNode* _AnimationManager::GetCurrentTransaction(bool withGroup) const { - // default transaction is always committed. - if (__pCurrentTransaction && __pCurrentTransaction->IsCommitted()) - { - return null; - } - if (withGroup == false) { return __pCurrentTransactionExceptGroup; diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp index 935fe0d..0bfb7d3 100755 --- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp @@ -325,9 +325,7 @@ _ButtonPresenter::DrawBackground(void) imagePath = _BitmapImpl::GetInstance(*pBackgroundBitmap)->GetFileName(); } - if (imagePath.IsEmpty() == false && __pButton->GetText() == L"" - && __pButton->GetBitmap(_BUTTON_STATUS_NORMAL) == null && __pButton->GetBitmap(_BUTTON_STATUS_DISABLED) == null - && __pButton->GetBitmap(_BUTTON_STATUS_PRESSED) == null && __pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null) + if (imagePath.IsEmpty() == false && __pButton->GetText() == L"" && __pButton->GetBitmap(status) == null) { __pBase->SetBackgroundColor(_Colorf( (float)bgColor.GetRed() / 255, (float)bgColor.GetGreen() / 255, (float)bgColor.GetBlue() / 255, (float)bgColor.GetAlpha() / 255)); diff --git a/src/ui/controls/FUiCtrl_DateTimeBar.cpp b/src/ui/controls/FUiCtrl_DateTimeBar.cpp index 213ca4e..1a64190 100644 --- a/src/ui/controls/FUiCtrl_DateTimeBar.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeBar.cpp @@ -94,6 +94,9 @@ _DateTimeBar::CreateDateTimeBarN(_Control& owner) pDateTimeBar->__pOwner = &owner; + // if SetActivationEnabled is removed, then remove IsActivatedOnOpen CallBack as well. + pDateTimeBar->SetActivationEnabled(false); + pDateTimeBar->__pDateTimeBarPresenter = _DateTimeBarPresenter::CreateInstanceN(*pDateTimeBar); r = GetLastResult(); SysTryCatch(NID_UI_CTRL, pDateTimeBar->__pDateTimeBarPresenter != null, , r, @@ -128,6 +131,12 @@ CATCH: return null; } +bool +_DateTimeBar::IsActivatedOnOpen(void) const +{ + return false; +} + result _DateTimeBar::SetPositionAndAlignment(const FloatPoint& point, _DateTimeBarAlignment alignment) { @@ -416,31 +425,35 @@ _DateTimeBar::OnAttachedToMainTree(void) { SetOwner(__pOwner); - return _Window::OnAttachedToMainTree(); -} + int itemWidth = 0; -void -_DateTimeBar::OnActivated(void) -{ - RefreshItems(); - SetTouchCapture(true, true); + if (GetSelectedBoxId() == DATETIME_ID_MONTH) + { + GET_SHAPE_CONFIG(DATETIMEBAR::MONTH_ITEM_WIDTH, _ControlManager::GetInstance()->GetOrientation(), itemWidth); + } + else if (GetSelectedBoxId() == DATETIME_ID_YEAR) + { + GET_SHAPE_CONFIG(DATETIMEBAR::YEAR_ITEM_WIDTH, _ControlManager::GetInstance()->GetOrientation(), itemWidth); + } + else + { + GET_SHAPE_CONFIG(DATETIMEBAR::DAY_ITEM_WIDTH, _ControlManager::GetInstance()->GetOrientation(), itemWidth); + } - return _Window::OnActivated(); -} + __pDateTimeBarPresenter->SetInitialAnimationValue(itemWidth); -void -_DateTimeBar::OnDeactivated(void) -{ - ReleaseTouchCapture(); + __pDateTimeBarPresenter->StartAnimationEffect(); - GetOwner()->Invalidate(); + SetTouchCapture(true, true); - return _Window::OnDeactivated(); + return _Window::OnAttachedToMainTree(); } result _DateTimeBar::OnDetachingFromMainTree(void) { + ReleaseTouchCapture(); + return _Window::OnDetachingFromMainTree(); } @@ -602,31 +615,6 @@ _DateTimeBar::GetParentWindowBounds() const return __parentWindowBounds; } -void -_DateTimeBar::RefreshItems(void) -{ - float itemWidth = 0; - - if (GetSelectedBoxId() == DATETIME_ID_MONTH) - { - GET_SHAPE_CONFIG(DATETIMEBAR::MONTH_ITEM_WIDTH, _ControlManager::GetInstance()->GetOrientation(), itemWidth); - } - else if (GetSelectedBoxId() == DATETIME_ID_YEAR) - { - GET_SHAPE_CONFIG(DATETIMEBAR::YEAR_ITEM_WIDTH, _ControlManager::GetInstance()->GetOrientation(), itemWidth); - } - else - { - GET_SHAPE_CONFIG(DATETIMEBAR::DAY_ITEM_WIDTH, _ControlManager::GetInstance()->GetOrientation(), itemWidth); - } - - __pDateTimeBarPresenter->SetInitialAnimationValue(itemWidth); - - __pDateTimeBarPresenter->StartAnimationEffect(); - - return; -} - bool _DateTimeBar::OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element) { diff --git a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp index 1dcf504..362ab32 100755 --- a/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_DateTimeBarPresenter.cpp @@ -58,7 +58,7 @@ _DateTimeBarPresenter::_DateTimeBarPresenter(_DateTimeBar* pDateTimeBar) , __pBgColorReplacementBitmap(null) , __pArrowColorReplacementBitmap(null) , __isInitialAnimation(false) - , __initialAnimationValue(0.0f) + , __initialAnimationValue(0) , __pFont(null) { } @@ -1339,9 +1339,9 @@ _DateTimeBarPresenter::StartAnimationEffect(void) __isInitialAnimation = true; __distance = -10.0f; - if (__initialAnimationValue >= 0.0f ) + if (__initialAnimationValue >= 0 ) { - __initialAnimationValue = __initialAnimationValue + __distance; + __initialAnimationValue = __initialAnimationValue + _CoordinateSystemUtils::ConvertToInteger(__distance); StartFlickAnimationTimer(); LoadItems(); @@ -1350,7 +1350,7 @@ _DateTimeBarPresenter::StartAnimationEffect(void) } else { - __initialAnimationValue = 0.0f; + __initialAnimationValue = 0; __isInitialAnimation = false; ResetFlickAnimationTimer(); ValidateAndAdjustStartPosition(); @@ -1465,7 +1465,7 @@ _DateTimeBarPresenter::ValidateAndAdjustStartPosition(void) } void -_DateTimeBarPresenter::SetInitialAnimationValue(float animationValue) +_DateTimeBarPresenter::SetInitialAnimationValue(int animationValue) { __initialAnimationValue = animationValue; return; diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp index b1db30e..05f0ebf 100644 --- a/src/ui/controls/FUiCtrl_Edit.cpp +++ b/src/ui/controls/FUiCtrl_Edit.cpp @@ -2729,6 +2729,20 @@ _Edit::SetCursorDisabled(bool disabled) return; } +void +_Edit::SetPressedGuideTextColor(const Color& color) +{ + __pressedGuideTextColor = color; + + return; +} + +Color +_Edit::GetPressedGuideTextColor(void) const +{ + return __pressedGuideTextColor; +} + result _Edit::SetPropertyAutoResizingEnabled(const Variant& enable) { diff --git a/src/ui/controls/FUiCtrl_EditDate.cpp b/src/ui/controls/FUiCtrl_EditDate.cpp index a52c8db..a634c30 100644 --- a/src/ui/controls/FUiCtrl_EditDate.cpp +++ b/src/ui/controls/FUiCtrl_EditDate.cpp @@ -785,8 +785,6 @@ _EditDate::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo) { FloatRectangle absoluteBounds = GetAbsoluteBoundsF(); - SetFocused(true); - if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height) { CalculateDateTimeBarPosition(); diff --git a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp index fcfbced..7f43956 100644 --- a/src/ui/controls/FUiCtrl_EditDatePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditDatePresenter.cpp @@ -681,7 +681,7 @@ _EditDatePresenter::OnTouchPressed(const _Control& source, const _TouchInfo& tou if (boxId < DATETIME_ID_YEAR || boxId > DATETIME_ID_DAY) { __selectedId = DATETIME_ID_NONE; - return false; + return true; } int minValue = -1; @@ -727,6 +727,9 @@ _EditDatePresenter::OnTouchPressed(const _Control& source, const _TouchInfo& tou } __selectedId = boxId; + + __pEditDate->Invalidate(); + return true; } @@ -745,22 +748,14 @@ _EditDatePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to _DateTimeId boxId = DATETIME_ID_NONE; boxId = GetBoxIdFromPosition(point); - if (boxId != __selectedId || boxId == DATETIME_ID_NONE) - { - if (__pEditDate->GetDateTimeBar() != null && __pEditDate->GetDateTimeBar()->IsActivated()) - { - __pEditDate->GetDateTimeBar()->SetVisibleState(false); - __pEditDate->GetDateTimeBar()->Close(); - } - Draw(); + if (boxId != __selectedId) + { __selectedId = DATETIME_ID_NONE; - SetLastSelectedId(__selectedId); - - return true; } SetLastSelectedId(__selectedId); + __selectedId = DATETIME_ID_NONE; __lastSelectedValue = ""; _DateTimeUtils dateTimeUtils; @@ -780,9 +775,9 @@ _EditDatePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP); } - Draw(); + __pEditDate->Invalidate(); - if ((__pEditDate->GetDateTimeBar() != null) && (GetLastSelectedId() != DATETIME_ID_NONE)) + if (__pEditDate->GetDateTimeBar() != null && GetLastSelectedId() != DATETIME_ID_NONE) { FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f); bounds = GetDateAreaBounds(GetLastSelectedId()); @@ -791,19 +786,11 @@ _EditDatePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to bounds.x += absoluteBounds.x; __pEditDate->GetDateTimeBar()->CalculateArrowBounds(bounds); - - if (__pEditDate->GetDateTimeBar()->IsActivated()) - { - __pEditDate->GetDateTimeBar()->RefreshItems(); - } - else - { - __pEditDate->GetDateTimeBar()->SetVisibleState(true); - __pEditDate->GetDateTimeBar()->Open(); - } + __pEditDate->GetDateTimeBar()->SetVisibleState(true); + __pEditDate->GetDateTimeBar()->Close(); + __pEditDate->GetDateTimeBar()->Open(); } - __selectedId = DATETIME_ID_NONE; return true; } @@ -817,6 +804,8 @@ _EditDatePresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& to __selectedId = DATETIME_ID_NONE; + __pEditDate->Invalidate(); + return true; } @@ -835,6 +824,7 @@ _EditDatePresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touch __selectedId = DATETIME_ID_NONE; } + __pEditDate->Invalidate(); return false; } @@ -843,7 +833,7 @@ _EditDatePresenter::OnTouchMoveHandled(const _Control& control) { __touchMoveHandled = true; __selectedId = DATETIME_ID_NONE; - + __pEditDate->Invalidate(); return; } diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp index 2e4a809..162b9e7 100755 --- a/src/ui/controls/FUiCtrl_EditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp @@ -1695,6 +1695,14 @@ _EditPresenter::DrawTextForEntireFontSetting(Canvas& canvas) { __pGuideTextObject->SetForegroundColor(__pEdit->GetGuideTextColor(), 0, __pGuideTextObject->GetTextLength()); + if (GetSearchBarFlag()) + { + if (__isTouchPressed) + { + __pGuideTextObject->SetForegroundColor(__pEdit->GetPressedGuideTextColor(), 0, __pGuideTextObject->GetTextLength()); + } + } + if (__isGuideTextColorChanged == true && __pEdit->IsSettingGuideTextColor() == false) { __pGuideTextObject->SetForegroundColor(__pEdit->GetTextColor(EDIT_STATUS_NORMAL), 0, __pGuideTextObject->GetTextLength()); @@ -8174,6 +8182,28 @@ _EditPresenter::IsAutoResizingEnabled(void) const return __pEditModel->IsAutoResizingEnabled(); } +result +_EditPresenter::SetDefaultFont(void) +{ + result r = E_SUCCESS; + + Font* pControlFont = null; + _ControlOrientation orientation = __pEdit->GetOrientation(); + float defaultFontSize = 0.0f; + GET_SHAPE_CONFIG(EDIT::DEFAULT_FONT_SIZE, orientation, defaultFontSize); + + __isFontInitialized = false; + __contentFontSize = defaultFontSize; + __contentFontStyle = FONT_STYLE_PLAIN; + pControlFont = __pEdit->GetFallbackFont(); + if (pControlFont) + { + AdjustFont(*pControlFont); + } + + return r; +} + float _EditPresenter::CalculateFlexibleHeightF(void) { diff --git a/src/ui/controls/FUiCtrl_EditTime.cpp b/src/ui/controls/FUiCtrl_EditTime.cpp index b8af3e4..e4068c2 100644 --- a/src/ui/controls/FUiCtrl_EditTime.cpp +++ b/src/ui/controls/FUiCtrl_EditTime.cpp @@ -577,8 +577,6 @@ _EditTime::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo) { FloatRectangle absoluteBounds = GetAbsoluteBoundsF(); - SetFocused(true); - if (absoluteBounds.y != __absoluteBounds.y || absoluteBounds.height != __absoluteBounds.height) { CalculateDateTimeBarPosition(); diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp index c76ee2c..d2dd65a 100755 --- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp +++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp @@ -701,6 +701,7 @@ _EditTimePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const { result r = E_SUCCESS; + Font font; Color textColor; _DateTimeId boxId = DATETIME_ID_NONE; @@ -914,18 +915,17 @@ _EditTimePresenter::OnTouchPressed(const _Control& source, const _TouchInfo& tou } else if (boxId == DATETIME_ID_AMPM) { - __selectedId = boxId; __bounds = ampmBounds; - Draw(); } else { __selectedId = DATETIME_ID_NONE; return false; } - __selectedId = boxId; + __pEditTime->Draw(); + return true; } @@ -952,27 +952,21 @@ _EditTimePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to _DateTimeId boxId = GetBoxIdFromPosition(point); - if (boxId != __selectedId || boxId == DATETIME_ID_NONE) + if (boxId < 0) { - if (__pEditTime->GetDateTimeBar() != null && __pEditTime->GetDateTimeBar()->IsActivated()) - { - __pEditTime->GetDateTimeBar()->SetVisibleState(false); - __pEditTime->GetDateTimeBar()->Close(); - } - - Draw(); - __selectedId = DATETIME_ID_NONE; - SetLastSelectedId(__selectedId); + } - return true; + if (boxId != __selectedId) + { + __selectedId = DATETIME_ID_NONE; } SetLastSelectedId(__selectedId); + __selectedId = DATETIME_ID_NONE; __lastSelectedValue = ""; _DateTimeUtils dateTimeUtils; - if (GetLastSelectedId() == DATETIME_ID_HOUR) { int hours = GetHour(); @@ -994,29 +988,18 @@ _EditTimePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to __lastSelectedValue.Format(10, L"%02d", GetMinute()); PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP); } - else if (GetLastSelectedId() == DATETIME_ID_AMPM) + + if (GetLastSelectedId() == DATETIME_ID_AMPM) { SetAmEnabled(!GetAmEnabled()); __pEditTime->FireTimeChangeEvent(TIME_INTERNAL_CHANGE_SAVED); __pEditTime->UpdateAccessibilityElement(); PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP); - - __selectedId = DATETIME_ID_NONE; - - if (__pEditTime->GetDateTimeBar() != null && __pEditTime->GetDateTimeBar()->IsActivated()) - { - __pEditTime->GetDateTimeBar()->SetVisibleState(false); - __pEditTime->GetDateTimeBar()->Close(); - } - - Draw(); - - return true; } - Draw(); + __pEditTime->Draw(); - if ((__pEditTime->GetDateTimeBar() != null) && (boxId != DATETIME_ID_AMPM) && (GetLastSelectedId() != DATETIME_ID_NONE)) + if (__pEditTime->GetDateTimeBar() != null && boxId != DATETIME_ID_AMPM && GetLastSelectedId() != DATETIME_ID_NONE) { FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f); bounds = GetDisplayAreaBoundsFromHoursStyle(GetLastSelectedId()); @@ -1025,19 +1008,11 @@ _EditTimePresenter::OnTouchReleased(const _Control& source, const _TouchInfo& to bounds.x += absoluteBounds.x; __pEditTime->GetDateTimeBar()->CalculateArrowBounds(bounds); - - if (__pEditTime->GetDateTimeBar()->IsActivated()) - { - __pEditTime->GetDateTimeBar()->RefreshItems(); - } - else - { - __pEditTime->GetDateTimeBar()->SetVisibleState(true); - __pEditTime->GetDateTimeBar()->Open(); - } + __pEditTime->GetDateTimeBar()->SetVisibleState(true); + __pEditTime->GetDateTimeBar()->Close(); + __pEditTime->GetDateTimeBar()->Open(); } - __selectedId = DATETIME_ID_NONE; return true; } @@ -1051,6 +1026,8 @@ _EditTimePresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& to __selectedId = DATETIME_ID_NONE; + __pEditTime->Draw(); + return true; } @@ -1069,6 +1046,7 @@ _EditTimePresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touch __selectedId = DATETIME_ID_NONE; } + __pEditTime->Invalidate(); return false; } @@ -1077,7 +1055,7 @@ _EditTimePresenter::OnTouchMoveHandled(const _Control& control) { __touchMoveHandled = true; __selectedId = DATETIME_ID_NONE; - + __pEditTime->Invalidate(); return; } diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp index 9300c35..b066e9b 100644 --- a/src/ui/controls/FUiCtrl_Form.cpp +++ b/src/ui/controls/FUiCtrl_Form.cpp @@ -2593,14 +2593,93 @@ _Form::IsNotificationTrayOpenEnabled(void) const return true; } +void +_Form::MakeFocusList(const _Control* pControl, IListT<_Control*>* pFocusControlList) const +{ + int childCount = pControl->GetChildCount(); + for(int i = 0; i < childCount; i++) + { + _Control* pChildControl = pControl->GetChild(i); + Rectangle rect = pChildControl->GetAbsoluteBounds(); + unique_ptr > pEnum (pFocusControlList->GetEnumeratorN()); + int index = 0; + while (pEnum->MoveNext() == E_SUCCESS) + { + _Control* pEnumeratorControl = null; + pEnum->GetCurrent(pEnumeratorControl); + if (pEnumeratorControl != null) + { + Rectangle enumeratorRect = pEnumeratorControl->GetAbsoluteBounds(); + if(enumeratorRect.y > rect.y) + { + break; + } + else if (enumeratorRect.y == rect.y) + { + if(enumeratorRect.x > rect.x) + { + break; + } + } + + index ++; + } + } + pFocusControlList->InsertAt(pChildControl, index); + } +} + +void +_Form::MakeChildContainerFocusList(_Control* pControl, int startIndex) const +{ + unique_ptr > pTempList (new (std::nothrow) ArrayListT<_Control*>); + SysTryReturnVoidResult(NID_UI_CTRL, pTempList, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient."); + MakeFocusList(pControl, pTempList.get()); + + unique_ptr > pTempEnum(pTempList->GetEnumeratorN()); + int index = ++startIndex; + while (pTempEnum->MoveNext() == E_SUCCESS) + { + _Control* pEnumeratorControl = null; + pTempEnum->GetCurrent(pEnumeratorControl); + __pFocusControlList->InsertAt(pEnumeratorControl, index); + index ++; + } +} + IListT<_Control*>* _Form::GetFocusList(void) const { if(!__pFocusControlList) { - __pFocusControlList.reset(GetFocusListN()); - __pFocusControlList->InsertAt(const_cast<_Form*>(this), 0); + __pFocusControlList.reset(new (std::nothrow) ArrayListT<_Control*>); + SysTryReturn(NID_UI, __pFocusControlList, null, E_SYSTEM, "[E_OUT_OF_MEMORY] Memory is insufficient."); + MakeFocusList(this, __pFocusControlList.get()); + + unique_ptr > pEnum(__pFocusControlList->GetEnumeratorN()); + int i =0; + int nextContainerIndex = -1; + while ( pEnum->MoveNext() == E_SUCCESS) + { + _Control* pEnumeratorControl = null; + pEnum->GetCurrent(pEnumeratorControl); + _ContainerImpl* pTempContainerImpl = dynamic_cast<_ContainerImpl*>(static_cast <_ControlImpl* >(pEnumeratorControl->GetUserData())); + + if (pTempContainerImpl != null && (nextContainerIndex < i)) + { + if (pEnumeratorControl->IsChildControlFocusManage() == false) + { + MakeChildContainerFocusList(pEnumeratorControl, i); + nextContainerIndex = i; + pEnum.reset(__pFocusControlList->GetEnumeratorN()); + i = -1; + } + } + i++; + } + __pFocusControlList->InsertAt(dynamic_cast<_Control*> (const_cast<_Form*>(this)), 0); } + return __pFocusControlList.get(); } diff --git a/src/ui/controls/FUiCtrl_IconListPresenter.cpp b/src/ui/controls/FUiCtrl_IconListPresenter.cpp index ac95a1b..3bc91fc 100755 --- a/src/ui/controls/FUiCtrl_IconListPresenter.cpp +++ b/src/ui/controls/FUiCtrl_IconListPresenter.cpp @@ -2966,11 +2966,11 @@ _IconListPresenter::FireEventAfterTouchRelease(int index) if (isChecked) { - FireIconListViewItemEvent(EVENT_TYPE_ITEM_SELECTED, index, ICON_LIST_VIEW_ITEM_CHECKED); + FireIconListViewItemEvent(EVENT_TYPE_ITEM_SELECTED, index, ICON_LIST_VIEW_ITEM_UNCHECKED); } else { - FireIconListViewItemEvent(EVENT_TYPE_ITEM_SELECTED, index, ICON_LIST_VIEW_ITEM_UNCHECKED); + FireIconListViewItemEvent(EVENT_TYPE_ITEM_SELECTED, index, ICON_LIST_VIEW_ITEM_CHECKED); } break; } diff --git a/src/ui/controls/FUiCtrl_Popup.cpp b/src/ui/controls/FUiCtrl_Popup.cpp index 5720381..3c01597 100644 --- a/src/ui/controls/FUiCtrl_Popup.cpp +++ b/src/ui/controls/FUiCtrl_Popup.cpp @@ -640,34 +640,5 @@ _Popup::OnOwnerChanged(_Control* pOldOwner) } } -void -_Popup::UpdateClientBounds(const FloatDimension& size, FloatRectangle& clientBounds) -{ - float y = 0.0f; - - float titleHeight = 0.0f; - float titleLetfMargin = 0.0f; - float titleRightMargin = 0.0f; - - _ControlOrientation orientation; - - orientation = GetOrientation(); - - GET_SHAPE_CONFIG(POPUP::TITLE_HEIGHT, orientation, titleHeight); - GET_SHAPE_CONFIG(POPUP::TITLE_TEXT_LEFT_MARGIN, orientation, titleLetfMargin); - GET_SHAPE_CONFIG(POPUP::TITLE_TEXT_RIGHT_MARGIN, orientation, titleRightMargin); - - if (HasTitle()) - { - y = titleHeight; - } - - clientBounds.x = titleLetfMargin; - clientBounds.y = y; - - clientBounds.width = size.width - (titleLetfMargin + titleRightMargin); - clientBounds.height = size.height - y; -} - }}} // Tizen::Ui::Controls diff --git a/src/ui/controls/FUiCtrl_SearchBar.cpp b/src/ui/controls/FUiCtrl_SearchBar.cpp index edbbf79..6e2c1b6 100644 --- a/src/ui/controls/FUiCtrl_SearchBar.cpp +++ b/src/ui/controls/FUiCtrl_SearchBar.cpp @@ -66,7 +66,6 @@ _SearchBar::_SearchBar(void) , __isUsableCancelButton(false) , __isUserContainerBounds(false) , __isCancelActionInProgress(false) - , __isUserGuideTextColor(false) , __keypadAction(CORE_KEYPAD_ACTION_SEARCH) , __pBackgroundBitmap(null) , __backgroundColor(Color()) @@ -212,18 +211,15 @@ _SearchBar::Initialize(bool enableSearchBarButton, CoreKeypadAction keypadAction { case SEARCH_FIELD_STATUS_DISABLED: GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_DISABLED, __color[i]); - GET_COLOR_CONFIG(SEARCHBAR::EDIT_TEXT_DISABLED, __textColor[i]); GET_COLOR_CONFIG(SEARCHBAR::GUIDE_TEXT_DISABLED, __guideTextColor[i]); break; case SEARCH_FIELD_STATUS_HIGHLIGHTED: GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_NORMAL, __color[i]); - GET_COLOR_CONFIG(SEARCHBAR::EDIT_TEXT_HIGHLIGHTED, __textColor[i]); GET_COLOR_CONFIG(SEARCHBAR::GUIDE_TEXT_HIGHLIGHTED, __guideTextColor[i]); break; default: GET_COLOR_CONFIG(SEARCHBAR::EDIT_BG_NORMAL, __color[i]); - GET_COLOR_CONFIG(SEARCHBAR::EDIT_TEXT_NORMAL, __textColor[i]); GET_COLOR_CONFIG(SEARCHBAR::GUIDE_TEXT_NORMAL, __guideTextColor[i]); break; } @@ -307,6 +303,7 @@ _SearchBar::CreateSearchField(void) editBounds.width = (editBounds.width > searchFieldMinWidth) ? editBounds.width : searchFieldMinWidth; editBounds.height = (editBounds.height > searchFieldMinHeight) ? editBounds.height : searchFieldMinHeight; + __pEdit = _Edit::CreateEditN(); r = GetLastResult(); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); @@ -334,11 +331,8 @@ _SearchBar::CreateSearchField(void) __pEdit->SetColor(editStatus, __color[status]); } - __pEdit->SetTextColor(EDIT_TEXT_COLOR_NORMAL, __textColor[SEARCH_FIELD_STATUS_NORMAL]); - __pEdit->SetTextColor(EDIT_TEXT_COLOR_DISABLED, __textColor[SEARCH_FIELD_STATUS_DISABLED]); - __pEdit->SetTextColor(EDIT_TEXT_COLOR_HIGHLIGHTED, __textColor[SEARCH_FIELD_STATUS_HIGHLIGHTED]); - __pEdit->ReplaceDefaultBackgroundBitmapForSearchBar(); + __pEdit->SetPressedGuideTextColor(__guideTextColor[SEARCH_FIELD_STATUS_HIGHLIGHTED]); __pEdit->SetKeypadAction(__keypadAction); @@ -1245,7 +1239,6 @@ _SearchBar::SetGuideTextColor(const Color& color) SysTryReturn(NID_UI_CTRL, __pEdit, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has occurred. The edit instance is null."); - __isUserGuideTextColor = true; return __pEdit->SetGuideTextColor(color); } @@ -1551,11 +1544,8 @@ _SearchBar::OnChangeLayout(_ControlOrientation orientation) void _SearchBar::OnDraw(void) { - if (!__isUserGuideTextColor) - { - SearchFieldStatus status = GetCurrentStatus(); - __pEdit->SetGuideTextColor(__guideTextColor[status]); - } + SearchFieldStatus searchFieldStatus = GetCurrentStatus(); + SetGuideTextColor(__guideTextColor[searchFieldStatus]); __pSearchBarPresenter->Draw(); return; diff --git a/src/ui/controls/FUiCtrl_SlidableGroupedListImpl.cpp b/src/ui/controls/FUiCtrl_SlidableGroupedListImpl.cpp index e7e32c6..1cd814a 100644 --- a/src/ui/controls/FUiCtrl_SlidableGroupedListImpl.cpp +++ b/src/ui/controls/FUiCtrl_SlidableGroupedListImpl.cpp @@ -123,16 +123,6 @@ _SlidableGroupedListItemProvider::CreateGroupItem(int groupIndex, int itemWidth) r = _CustomListItemImpl::CreateTableViewItem(tableViewItemParams); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r)); - if (GetItemCount(groupIndex) == 0 && groupIndex > __pListImpl->__topGroup) - { - __pListImpl->__bottomGroup++; - } - - if (groupIndex < __pListImpl->__topGroup) - { - __pListImpl->__topGroup = groupIndex; - } - return __pListImpl->GetTableViewGroupItemAt(groupIndex); } @@ -145,25 +135,6 @@ _SlidableGroupedListItemProvider::DeleteGroupItem(int groupIndex, TableViewGroup pCustomListItem->__pCustomListItemImpl->__pTableViewGroupItemData = null; } - if (__pListImpl->GetItemCountAt(groupIndex) == 0) - { - if (groupIndex == __pListImpl->__topGroup) - { - if (__pListImpl->__topGroup < __pListImpl->__bottomGroup) - { - __pListImpl->__topGroup++; - } - } - else if (groupIndex < __pListImpl->__topGroup) - { - __pListImpl->__topGroup--; - } - if (__pListImpl->__bottomGroup != 0) - { - __pListImpl->__bottomGroup--; - } - } - delete pItem; return true; @@ -521,10 +492,6 @@ _SlidableGroupedListItemProvider::DeleteItem(int groupIndex, int itemIndex, Tabl } } } - else if (__pListImpl->__isFullUpdate == true) - { - __pListImpl->RemoveFromItemsList(groupIndex, (__pListImpl->GetSubItemCountAt(groupIndex) - 1), false); - } delete pItem; pItem = null; @@ -568,7 +535,6 @@ _SlidableGroupedListImpl::_SlidableGroupedListImpl(Control* pList, _TableView* p , __bottomGroup(0) , __topGroup(0) , __loadedCount(0) - , __isFullUpdate(false) , __pItemProvider(null) , __directDelete(false) , __forceScroll(false) @@ -906,14 +872,10 @@ _SlidableGroupedListImpl::InsertGroupAt(int groupIndex, const String& text, cons return E_SUCCESS; } - if (groupIndex <= __bottomGroup) - { - __bottomGroup++; - } - - if (groupIndex < __topGroup) + if (groupIndex <= __topGroup) { __topGroup++; + __bottomGroup++; } if (__pItemProvider == null) @@ -1125,6 +1087,9 @@ _SlidableGroupedListImpl::InsertItemAt(int groupIndex, int index, const CustomLi SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __groupsList.GetCount()), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. groupIndex (%d).", groupIndex); + SysTryReturn(NID_UI_CTRL, (index >= GetTopItemIndex(groupIndex) && index <= (GetSubItemCountAt(groupIndex) + GetTopItemIndex(groupIndex))), E_INVALID_ARG, E_INVALID_ARG, + "[E_INVALID_ARG] Invalid argument is used. index (%d).", index); + _TableViewItemParams tableViewItemParams; tableViewItemParams.pItem = (const_cast(&item)); @@ -1141,12 +1106,8 @@ _SlidableGroupedListImpl::InsertItemAt(int groupIndex, int index, const CustomLi SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] A system error has occurred. Failed to create an item.", GetErrorMessage(r)); - int subItemCount = GetSubItemCountAt(groupIndex); - if (index < (subItemCount + GetTopItemIndex(groupIndex)) && (index >= GetTopItemIndex(groupIndex))) - { - r = InsertIntoItemsList(item, groupIndex, (index - GetTopItemIndex(groupIndex))); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r)); - } + r = InsertIntoItemsList(item, groupIndex, (index - GetTopItemIndex(groupIndex))); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r)); _SlidableGroupObject* pGroupObject = dynamic_cast<_SlidableGroupObject*>(const_cast(__groupsList.GetAt(groupIndex))); SysTryReturn(NID_UI_CTRL, pGroupObject, E_SYSTEM, E_SYSTEM, @@ -1411,17 +1372,40 @@ _SlidableGroupedListImpl::RemoveAllCheckedItemsAt(int groupIndex, int itemHeight SysTryReturn(NID_UI_CTRL, pGroupObject, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to get _SlidableGroupObject at index (%d).", groupIndex); + result r = E_SUCCESS; Boolean* pChecked = null; int itemIndex = 0; + int subItemCount = GetSubItemCountAt(groupIndex); - for (itemIndex = (GetItemCountAt(groupIndex) - 1); itemIndex >= 0; itemIndex--) + for (itemIndex = pGroupObject->__itemCount; itemIndex >= 0; itemIndex--) { pChecked = dynamic_cast(pGroupObject->__pCheckedList->GetAt(itemIndex)); if (pChecked && pChecked->ToBool() == true) { - RemoveItemAt(groupIndex, itemIndex, 0); + if (pGroupObject->__pCheckedList != null) + { + pGroupObject->__pCheckedList->RemoveAt(itemIndex, true); + } + + __directDelete = true; + + if (itemIndex < (subItemCount + pGroupObject->__topIndex) && (itemIndex >= pGroupObject->__topIndex)) + { + RemoveFromItemsList(groupIndex, (itemIndex - pGroupObject->__topIndex)); + } + + r = GetCore().RefreshTableView(groupIndex, itemIndex, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE); + if (r != E_SUCCESS) + { + SysLog(NID_UI_CTRL, "Group item with index %d not removed successFully.", groupIndex); + } + + __directDelete = false; + + CallUnloadItemCb(groupIndex, itemIndex); + pGroupObject->__itemCount--; } } @@ -1452,17 +1436,35 @@ _SlidableGroupedListImpl::RemoveAllCheckedItems(int itemHeight) result _SlidableGroupedListImpl::RemoveAllItemsAt(int groupIndex) { + result r = E_SUCCESS; SysTryReturn(NID_UI_CTRL, (groupIndex >= 0 && groupIndex < __groupsList.GetCount()), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. groupIndex (%d).", groupIndex); - int itemIndex = 0; + _SlidableGroupObject* pGroupObject = dynamic_cast<_SlidableGroupObject*>(__groupsList.GetAt(groupIndex)); + SysTryReturn(NID_UI_CTRL, pGroupObject, E_SYSTEM, E_SYSTEM, + "[E_SYSTEM] A system error has occurred. Failed to get _SlidableGroupObject at index (%d).", groupIndex); + + __directDelete = true; - for (itemIndex = (GetItemCountAt(groupIndex) - 1); itemIndex >= 0; itemIndex--) + for (int itemCount = 0; itemCount < GetSubItemCountAt(groupIndex);) { - RemoveItemAt(groupIndex, itemIndex, 0); + r = RemoveItemAt(groupIndex, 0, 0); + if (r != E_SUCCESS) + { + SysLog(NID_UI_CTRL, "Group item with index %d not removed successFully.", groupIndex); + } + } + + __directDelete = false; + + if (pGroupObject->__pCheckedList != null) + { + pGroupObject->__pCheckedList->RemoveAll(true); } + pGroupObject->__itemCount = 0; + return E_SUCCESS; } @@ -1476,21 +1478,11 @@ _SlidableGroupedListImpl::RemoveAllItems(void) for (groupCount = 0; groupCount < __groupsList.GetCount(); groupCount++) { - _SlidableGroupObject* pGroupObject = dynamic_cast<_SlidableGroupObject*>(__groupsList.GetAt(groupCount)); - SysTryReturn(NID_UI_CTRL, pGroupObject, 0, E_SYSTEM, - "[E_SYSTEM] A system error has occurred. Failed to get _SlidableGroupObject at index (%d).", groupCount); - - pGroupObject->__itemCount = 0; - pGroupObject->__topIndex = 0; - + RemoveAllItemsAt(groupCount); } - __isFullUpdate = true; - GetCore().UpdateTableView(); - __isFullUpdate = false; - __pItemProvider->firstTime = true; - __topGroup = 0; + return E_SUCCESS; } @@ -1529,20 +1521,18 @@ _SlidableGroupedListImpl::RemoveItemAt(int groupIndex, int index, int itemHeight int subItemCount = GetSubItemCountAt(groupIndex); - SysTryReturn(NID_UI_CTRL, (index >= 0 && index < pGroupObject->__itemCount), + SysTryReturn(NID_UI_CTRL, (index >= 0 && index < subItemCount), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid argument is used. index (%d).", index); - __directDelete = true; - - if (pGroupObject->__pCheckedList != null) + if (!(index < pGroupObject->__topIndex + subItemCount)) { - pGroupObject->__pCheckedList->RemoveAt(index, true); + pGroupObject->__itemCount--; + return E_SUCCESS; } - if (index < (subItemCount + pGroupObject->__topIndex) && (index >= pGroupObject->__topIndex)) - { - RemoveFromItemsList(groupIndex, (index - pGroupObject->__topIndex)); - } + __directDelete = true; + + RemoveFromItemsList(groupIndex, index); result r = GetCore().RefreshTableView(groupIndex, index, TABLE_VIEW_REFRESH_TYPE_ITEM_REMOVE); if (r != E_SUCCESS) @@ -1550,6 +1540,11 @@ _SlidableGroupedListImpl::RemoveItemAt(int groupIndex, int index, int itemHeight SysLog(NID_UI_CTRL, "Group item with index %d not removed successFully.", groupIndex); } + if (pGroupObject->__pCheckedList != null) + { + pGroupObject->__pCheckedList->RemoveAt(index, true); + } + __directDelete = false; CallUnloadItemCb(groupIndex, index); diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp old mode 100644 new mode 100755 index 5f7c2c0..41a3540 --- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp @@ -39,7 +39,6 @@ using namespace Tizen::Graphics; using namespace Tizen::Base; using namespace Tizen::Ui::Animations; using namespace Tizen::Graphics::_Text; -using namespace Tizen::Base::Runtime; namespace Tizen { namespace Ui { namespace Controls { @@ -48,7 +47,6 @@ _SliderPresenter::_SliderPresenter(void) : __pSlider(null) , __pSliderModel(null) , __pSliderOverlay(null) - , __pSlideTimer(null) , __pResourceBgTopBitmap(null) , __pResourceBgMiddleBitmap(null) , __pResourceBgBottomBitmap(null) @@ -85,14 +83,13 @@ _SliderPresenter::_SliderPresenter(void) , __handleX(0) , __isSliderPressed(false) , __isNeedToBeUpdated(true) + , __isBubblingBlocked(false) , __isResourceLoaded(false) , __isCustomHandle(false) , __isCustomPressedTextColor(false) , __groupStyle(GROUP_STYLE_NONE) , __fontSize(0.0f) , __barOffset(0.0f) - , __isTimerRunning(false) - , __currentPosition(0.0f, 0.0f) { } @@ -104,13 +101,6 @@ _SliderPresenter::~_SliderPresenter(void) delete __pSliderOverlay; __pSliderOverlay = null; - if (__pSlideTimer != null) - { - __pSlideTimer->Cancel(); - delete __pSlideTimer; - __pSlideTimer = null; - } - delete __pResourceBgTopBitmap; __pResourceBgTopBitmap = null; @@ -691,7 +681,7 @@ CATCH: } int -_SliderPresenter::CalculateSliderValue(float positionX, float offsetX) +_SliderPresenter::CalculateSliderValue(int positionX, int offsetX) { int minValue = __pSliderModel->GetMinValue(); int maxValue = __pSliderModel->GetMaxValue(); @@ -1446,32 +1436,20 @@ _SliderPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touch return false; } - if (__pSlideTimer == null) - { - __pSlideTimer = new (std::nothrow) Timer; - SysTryReturn(NID_UI_CTRL, __pSlideTimer != null, true, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); - - result r = __pSlideTimer->Construct(*this); - if (r != E_SUCCESS) - { - delete __pSlideTimer; - __pSlideTimer = null; + Point point = _CoordinateSystemUtils::ConvertToInteger(touchinfo.GetCurrentPosition()); - return true; - } - } + __isBubblingBlocked = false; - FloatPoint point = touchinfo.GetCurrentPosition(); - - if (__handleRect.Contains(point) == true) + if (__pSlider->IsEnabled() == true && __handleRect.Contains(FloatPoint(point.x, point.y)) == true) { - __isSliderPressed = true; - int candidateValue = CalculateSliderValue(point.x, point.x - __handleRect.x); __pSliderModel->SetValue(candidateValue); __pSlider->SetAccessibilityElementValue(); + __isSliderPressed = true; + __isBubblingBlocked = true; + if (__pSlider->GetStyle() & _SLIDER_STYLE_OVERLAY) { __pSliderOverlay->Open(false); @@ -1480,7 +1458,7 @@ _SliderPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touch __pSlider->Invalidate(); } - return __isSliderPressed; + return __isBubblingBlocked; } bool @@ -1491,20 +1469,15 @@ _SliderPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& touc return false; } - if (__pSlideTimer != null) - { - __isTimerRunning = false; - __pSlideTimer->Cancel(); - } - - FloatPoint point = touchinfo.GetCurrentPosition(); + Point point = _CoordinateSystemUtils::ConvertToInteger(touchinfo.GetCurrentPosition()); + bool isBubblingBlocked = __isBubblingBlocked; Canvas* pCanvas = __pSlider->GetCanvasN(); SysTryReturn(NID_UI_CTRL, pCanvas != null, false, E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to get the canvas."); - if (point.x >= (pCanvas->GetBoundsF().x + pCanvas->GetBoundsF().width)) + if (point.x >= (pCanvas->GetBounds().x + pCanvas->GetBounds().width)) { - point.x = pCanvas->GetBoundsF().x + pCanvas->GetBoundsF().width; + point.x = pCanvas->GetBounds().x + pCanvas->GetBounds().width; } if (__isSliderPressed == true) @@ -1533,10 +1506,9 @@ _SliderPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& touc pAdjustmentEvent->Fire(*pEventArg); } - return true; } - return false; + return isBubblingBlocked; } bool @@ -1547,40 +1519,32 @@ _SliderPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchin return false; } - if (__isSliderPressed == false) - { - return false; - } - - FloatPoint point = touchinfo.GetCurrentPosition(); + Point point = _CoordinateSystemUtils::ConvertToInteger(touchinfo.GetCurrentPosition()); + bool isBubblingBlocked = __isBubblingBlocked; Canvas* pCanvas = __pSlider->GetCanvasN(); - SysTryReturn(NID_UI_CTRL, pCanvas != null, true, E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to get the canvas."); + SysTryReturn(NID_UI_CTRL, pCanvas != null, false, E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to get the canvas."); - if (point.x >= (pCanvas->GetBoundsF().x + pCanvas->GetBoundsF().width)) + if (point.x >= (pCanvas->GetBounds().x + pCanvas->GetBounds().width)) { - point.x = pCanvas->GetBoundsF().x + pCanvas->GetBoundsF().width; + point.x = pCanvas->GetBounds().x + pCanvas->GetBounds().width; } - __currentPosition.x = point.x; - __currentPosition.y = point.y; - if ( __isTimerRunning == false ) + if (__isSliderPressed == false) { - __isTimerRunning = true; - __pSlideTimer->Start(__timerValue); + return false; } - return true; -} - -void -_SliderPresenter::OnTimerExpired(Timer& timer) -{ - __isTimerRunning = false; + if (__pSlider->IsEnabled() == false) + { + __isSliderPressed = false; + return false; + } - float handleHalfWidth = __handleRect.width / 2; - int candidateValue = CalculateSliderValue(__currentPosition.x, handleHalfWidth); + float handleHalfWidth = __handleRect.width / 2.0f; + int oldValue = __pSliderModel->GetValue(); + int candidateValue = CalculateSliderValue(point.x, handleHalfWidth); __pSliderModel->SetValue(candidateValue); __pSlider->SetAccessibilityElementValue(); @@ -1588,21 +1552,21 @@ _SliderPresenter::OnTimerExpired(Timer& timer) __pSlider->Draw(); __pSlider->Show(); - // Slider Event Fire - _SliderEvent* pSliderEvent = dynamic_cast <_SliderEvent*>(__pSlider->GetSliderEvent()); - if (pSliderEvent != null) + if (oldValue != candidateValue) { - Tizen::Base::Runtime::IEventArg* pEventArg = _SliderEvent::CreateSliderEventArgN(candidateValue); - - if( pEventArg == null) + // Slider Event Fire + _SliderEvent* pSliderEvent = dynamic_cast <_SliderEvent*>(__pSlider->GetSliderEvent()); + if (pSliderEvent != null) { - return; - } + Tizen::Base::Runtime::IEventArg* pEventArg = _SliderEvent::CreateSliderEventArgN(candidateValue); + result r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, pEventArg != null, true, r, "[%s] Propagating.", GetErrorMessage(r)); - pSliderEvent->Fire(*pEventArg); + pSliderEvent->Fire(*pEventArg); + } } - return; + return isBubblingBlocked; } bool diff --git a/src/ui/controls/FUiCtrl_SplitPanel.cpp b/src/ui/controls/FUiCtrl_SplitPanel.cpp index 573b1e1..4de73f1 100644 --- a/src/ui/controls/FUiCtrl_SplitPanel.cpp +++ b/src/ui/controls/FUiCtrl_SplitPanel.cpp @@ -45,8 +45,6 @@ namespace Tizen { namespace Ui { namespace Controls _SplitPanel::_SplitPanel() : __pSplitPanelPresenter(null) , __pTapGesture(null) - , __pFirstPaneParent(null) - , __pSecondPaneParent(null) , __pFirstPane(null) , __pSecondPane(null) , __splitPanelDividerDirection(SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) @@ -72,7 +70,7 @@ _SplitPanel::CreateSplitPanelN(const FloatRectangle& rect, SplitPanelDividerStyl _ControlOrientation orientation = _CONTROL_ORIENTATION_PORTRAIT; pSplitPanel = new (std::nothrow) _SplitPanel; - SysTryReturn(NID_UI_CTRL, pSplitPanel, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryReturn(NID_UI_CTRL, pSplitPanel, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); r = pSplitPanel->Construct(splitPanelDividerStyle, splitPanelDividerDirection); if (r != E_SUCCESS) @@ -106,7 +104,7 @@ _SplitPanel::CreateSplitPanelN(const FloatRectangle& rect, SplitPanelDividerStyl pSplitPanel->__dividerPosition[_SPLIT_PANEL_HORIZONTAL_DIVIDER_ORIENTATION_LANDSCAPE] = rect.height / 2.0f; pSplitPanel->__pTapGesture = new (std::nothrow) _TouchTapGestureDetector; - SysTryCatch(NID_UI_CTRL, pSplitPanel->__pTapGesture, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_UI_CTRL, pSplitPanel->__pTapGesture, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); pSplitPanel->AddGestureDetector(*(pSplitPanel->__pTapGesture)); r = pSplitPanel->__pTapGesture->AddGestureListener(*pSplitPanel); @@ -141,7 +139,7 @@ _SplitPanel::Construct(SplitPanelDividerStyle splitPanelDividerStyle, SplitPanel result r = E_SUCCESS; __pDividerVisualElement = new (std::nothrow) VisualElement(); - SysTryReturnResult(NID_UI_CTRL, __pDividerVisualElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryReturnResult(NID_UI_CTRL, __pDividerVisualElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); r = __pDividerVisualElement->Construct(); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to construct divider visual element.", GetErrorMessage(r)); @@ -153,28 +151,11 @@ _SplitPanel::Construct(SplitPanelDividerStyle splitPanelDividerStyle, SplitPanel SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to attach divider visual element.", GetErrorMessage(r)); __pSplitPanelPresenter = new (std::nothrow) _SplitPanelPresenter; - SysTryCatch(NID_UI_CTRL, __pSplitPanelPresenter != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + SysTryCatch(NID_UI_CTRL, __pSplitPanelPresenter != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); r = __pSplitPanelPresenter->Construct(*this, splitPanelDividerStyle, splitPanelDividerDirection); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to construct presenter.", GetErrorMessage(r)); - __pFirstPaneParent = _Control::CreateControlN(); - r = GetLastResult(); - SysTryCatch(NID_UI_CTRL, __pFirstPaneParent != null, , r, "[%s] Propagating.", GetErrorMessage(r)); - - __pSecondPaneParent = _Control::CreateControlN(); - r = GetLastResult(); - SysTryCatch(NID_UI_CTRL, __pSecondPaneParent != null, , r, "[%s] Propagating.", GetErrorMessage(r)); - - __pFirstPaneParent->SetBackgroundColor(Color(0,0,0,0)); - __pSecondPaneParent->SetBackgroundColor(Color(0,0,0,0)); - - r = AttachChild(*__pFirstPaneParent); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - - r = AttachChild(*__pSecondPaneParent); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - return r; CATCH: @@ -184,37 +165,8 @@ CATCH: __pDividerVisualElement = null; } - if (__pSplitPanelPresenter) - { - delete __pSplitPanelPresenter; - __pSplitPanelPresenter = null; - } - - if (__pFirstPaneParent) - { - if (__pFirstPane) - { - __pFirstPaneParent->DetachChild(*__pFirstPane); - } - - DetachChild(*__pFirstPaneParent); - - delete __pFirstPaneParent; - __pFirstPaneParent = null; - } - - if (__pSecondPaneParent) - { - if (__pSecondPane) - { - __pSecondPaneParent->DetachChild(*__pSecondPane); - } - - DetachChild(*__pSecondPaneParent); - - delete __pSecondPaneParent; - __pSecondPaneParent = null; - } + delete __pSplitPanelPresenter; + __pSplitPanelPresenter = null; return r; } @@ -250,28 +202,10 @@ _SplitPanel::~_SplitPanel(void) if (__pDividerVisualElement) { - GetVisualElement()->DetachChild(*__pDividerVisualElement); - __pDividerVisualElement->Destroy(); __pDividerVisualElement = null; } - if (__pFirstPaneParent) - { - DetachChild(*__pFirstPaneParent); - - delete __pFirstPaneParent; - __pFirstPaneParent = null; - } - - if (__pSecondPaneParent) - { - DetachChild(*__pSecondPaneParent); - - delete __pSecondPaneParent; - __pSecondPaneParent = null; - } - ClearLastResult(); } @@ -291,7 +225,7 @@ _SplitPanel::AddSplitPanelEventListener(const _ISplitPanelEventListener& listene { __pSplitPanelEvent = _SplitPanelEvent::CreateInstanceN(*this); r = GetLastResult(); - SysTryReturn(NID_UI_CTRL, __pSplitPanelEvent, r, r, "[%s] Propagating.", GetErrorMessage(r)); + SysTryReturn(NID_UI_CTRL, __pSplitPanelEvent, r, r, "[%s] Propagating.", GetErrorMessage(r)) __pSplitPanelEvent->AddListener(listener); } @@ -303,7 +237,7 @@ result _SplitPanel::RemoveSplitPanelEventListener(const _ISplitPanelEventListener& listener) { SysTryReturn(NID_UI_CTRL, __pSplitPanelEvent, E_SYSTEM, E_SYSTEM, - "[E_SYSTEM] System error occurred."); + "[E_SYSTEM] System error occurred.") __pSplitPanelEvent->RemoveListener(listener); @@ -407,14 +341,14 @@ _SplitPanel::SetPane(_Control* pControl, SplitPanelPaneOrder paneOrder) if (paneOrder == SPLIT_PANEL_PANE_ORDER_FIRST) { - r = __pFirstPaneParent->AttachChild(*pControl); + r = AttachChild(*pControl); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); __pFirstPane = pControl; } else { - r = __pSecondPaneParent->AttachChild(*pControl); + r = AttachChild(*pControl); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); __pSecondPane = pControl; @@ -426,28 +360,25 @@ _SplitPanel::SetPane(_Control* pControl, SplitPanelPaneOrder paneOrder) _Control* _SplitPanel::GetPane(SplitPanelPaneOrder paneOrder) const { + SysTryReturn(NID_UI_CTRL, __pSplitPanelPresenter != null, null, E_SYSTEM, + "[E_SYSTEM] System error occurred."); + if (paneOrder == SPLIT_PANEL_PANE_ORDER_FIRST) { return const_cast <_Control*>(__pFirstPane); } - - return const_cast <_Control*>(__pSecondPane); -} - -_Control* -_SplitPanel::GetPaneParent(SplitPanelPaneOrder paneOrder) const -{ - if (paneOrder == SPLIT_PANEL_PANE_ORDER_FIRST) + else { - return const_cast <_Control*>(__pFirstPaneParent); + return const_cast <_Control*>(__pSecondPane); } - - return const_cast <_Control*>(__pSecondPaneParent); } result _SplitPanel::SetDividerStyle(SplitPanelDividerStyle splitPanelDividerStyle) { + SysTryReturn(NID_UI_CTRL, __pSplitPanelPresenter != null, E_SYSTEM, E_SYSTEM, + "[E_SYSTEM] System error occurred."); + __pSplitPanelPresenter->SetDividerStyle(splitPanelDividerStyle); return E_SUCCESS; @@ -463,25 +394,8 @@ result _SplitPanel::SetDividerPosition(float position) { const float width = GetBoundsF().width; - const float height = GetBoundsF().height; - int configValue = 0; - float margin = 0.0f; - _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); - - if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) - { - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, configValue); - } - else - { - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, configValue); - } - margin = _CoordinateSystemUtils::ConvertToFloat(configValue); - - if ((0.0f > position) || - ((GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) && ((width - margin) < position)) || - ((GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_HORIZONTAL) && ((height - margin) < position))) + if ((0.0f > position) || (width < position)) { return E_OUT_OF_RANGE; } @@ -494,6 +408,8 @@ _SplitPanel::SetDividerPosition(float position) } } + _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); + if (orientation == _CONTROL_ORIENTATION_LANDSCAPE) { if (GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) @@ -556,31 +472,24 @@ _SplitPanel::SetMaximumDividerPosition(float position) { if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_FIXED) { - SysLog(NID_UI_CTRL, "[E_SYSTEM] System error occurred. This functionality is not supported for divider style fixed."); + SysLog(NID_UI_CTRL, "[E_SYSTEM] System error occurred. This functionality is not supported for divider style fixed"); return E_SUCCESS; } - const float width = GetBoundsF().width; - const float height = GetBoundsF().height; - int configValue = 0; - float margin = 0.0f; _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); + const float width = GetBoundsF().width; + float margin = 0.0f; if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) { - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, configValue); + GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, margin); } else { - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, configValue); + GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, margin); } - margin = _CoordinateSystemUtils::ConvertToFloat(configValue); - - if ((0.0f > position) || - ((GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) && ((width - margin) < position)) || - ((GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_HORIZONTAL) && ((height - margin) < position)) || - (position < GetMinimumDividerPosition())) + if ((0.0f > position) || ((width - margin) < position) || (position < GetMinimumDividerPosition())) { return E_OUT_OF_RANGE; } @@ -661,30 +570,14 @@ _SplitPanel::SetMinimumDividerPosition(float position) } const float width = GetBoundsF().width; - const float height = GetBoundsF().height; - int configValue = 0; - float margin = 0.0f; - _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); - if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) - { - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, configValue); - } - else - { - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, configValue); - } - - margin = _CoordinateSystemUtils::ConvertToFloat(configValue); - - if ((0.0f > position) || - ((GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) && ((width - margin) < position)) || - ((GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_HORIZONTAL) && ((height - margin) < position)) || - (position > GetMaximumDividerPosition())) + if ((0.0f > position) || (width < position) || (position > GetMaximumDividerPosition())) { return E_OUT_OF_RANGE; } + _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); + if (orientation == _CONTROL_ORIENTATION_LANDSCAPE) { if (GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) @@ -770,30 +663,42 @@ _SplitPanel::GetDividerDirection(void) const result _SplitPanel::MaximizePane(SplitPanelPaneOrder paneOrder) { - return __pSplitPanelPresenter->MaximizePane(paneOrder); + SysTryReturn(NID_UI_CTRL, __pSplitPanelPresenter != null, E_SYSTEM, E_SYSTEM, + "[E_SYSTEM] System error occurred."); + + __pSplitPanelPresenter->MaximizePane(paneOrder); + + return E_SUCCESS; } bool _SplitPanel::IsPaneMaximized(SplitPanelPaneOrder paneOrder) const { + SysTryReturn(NID_UI_CTRL, __pSplitPanelPresenter != null, false, E_SYSTEM, + "[E_SYSTEM] System error occurred."); + return __pSplitPanelPresenter->IsPaneMaximized(paneOrder); } result _SplitPanel::RestorePane(void) { - return __pSplitPanelPresenter->RestorePane(); + SysTryReturn(NID_UI_CTRL, __pSplitPanelPresenter != null, E_SYSTEM, E_SYSTEM, + "[E_SYSTEM] System error occurred."); + + __pSplitPanelPresenter->RestorePane(); + + return E_SUCCESS; } result _SplitPanel::SendSplitPanelEvent(_SplitPanelEventStatus status) { result r = E_SUCCESS; - IEventArg* pEventArg = null; if (__pSplitPanelEvent) { - pEventArg = _SplitPanelEvent::CreateSplitPanelEventArgN(status); + IEventArg* pEventArg = _SplitPanelEvent::CreateSplitPanelEventArgN(status); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, pEventArg, r, r, "[%s] Propagating.", GetErrorMessage(r)); @@ -820,22 +725,19 @@ _SplitPanel::GetTapCount(void) const result _SplitPanel::OnAttachedToMainTree(void) { - String hintText = L""; - FloatRectangle dividerRect(0.0f, 0.0f, 0.0f, 0.0f); - _AccessibilityContainer* pContainer = null; - if (likely(!(_AccessibilityManager::IsActivated()))) { return E_SUCCESS; } - pContainer = GetAccessibilityContainer(); + _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if (pContainer) { if (__pDividerVisualElement) { - dividerRect = __pSplitPanelPresenter->GetDividerRectangle(); + FloatRectangle dividerRect = __pSplitPanelPresenter->GetDividerRectangle(); + String hintText = L""; if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_FIXED) { @@ -846,7 +748,7 @@ _SplitPanel::OnAttachedToMainTree(void) hintText = String(L"Drag scroll, double tap and move to adjust split area"); } - __pAccessibilityElement = new (std::nothrow) _AccessibilityElement(true); + __pAccessibilityElement = new _AccessibilityElement(true); SysTryReturn(NID_UI_CTRL, __pAccessibilityElement, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); __pAccessibilityElement->SetBounds(_CoordinateSystemUtils::ConvertToInteger(dividerRect)); @@ -888,7 +790,7 @@ _SplitPanel::SetDividerVisualElementBounds(FloatRectangle& bounds) bool _SplitPanel::OnAccessibilityValueIncreased(const _AccessibilityContainer& control, const _AccessibilityElement& element) { - SetDividerPosition(GetDividerPosition() + ACCESSIBILITY_DIVIDER_POSITION_OFFSET); + SetDividerPosition(GetDividerPosition() + 5); Invalidate(); return true; @@ -898,7 +800,7 @@ bool _SplitPanel::OnAccessibilityValueDecreased(const _AccessibilityContainer& control, const _AccessibilityElement& element) { - SetDividerPosition(GetDividerPosition() - ACCESSIBILITY_DIVIDER_POSITION_OFFSET); + SetDividerPosition(GetDividerPosition() - 5); Invalidate(); return true; diff --git a/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp b/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp index 397e014..7957001 100644 --- a/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SplitPanelPresenter.cpp @@ -37,7 +37,6 @@ using namespace Tizen::Ui; using namespace Tizen::Graphics; using namespace Tizen::Ui::Animations; -using namespace Tizen::Base; namespace Tizen { namespace Ui { namespace Controls { @@ -57,8 +56,8 @@ _SplitPanelPresenter::_SplitPanelPresenter(void) , __pDividerThumbBitmap(null) , __transactionIdMaximize(0) , __transactionIdRestore(0) - , __controlAnimatorInterpolator(ANIMATION_INTERPOLATOR_LINEAR) - , __visualElementInterpolator(L"Linear") + , __controlAnimatorAnimationInterpolator(ANIMATION_INTERPOLATOR_LINEAR) + , __visualElementAnimationInterpolator(L"Linear") { GET_COLOR_CONFIG(SPLITPANEL::DIVIDER_BG_NORMAL, __dividerBackgroundColor); GET_COLOR_CONFIG(SPLITPANEL::DIVIDER_BG_PRESSED, __dividerPressedBackgroundColor); @@ -107,8 +106,8 @@ _SplitPanelPresenter::Construct(const _SplitPanel& splitPanel, SplitPanelDivider AdjustDividerRectangle(); - __controlAnimatorInterpolator = ANIMATION_INTERPOLATOR_EASE_IN; - __visualElementInterpolator = L"EaseIn"; + __controlAnimatorAnimationInterpolator = ANIMATION_INTERPOLATOR_EASE_IN; + __visualElementAnimationInterpolator = L"EaseIn"; return E_SUCCESS; @@ -126,10 +125,10 @@ _SplitPanelPresenter::CheckDividerTouchRegion(float positionX, float positionY) Bitmap* pThumbBitmap = null; dividerPosition = __pSplitPanel->GetDividerPosition(); - pThumbBitmap = __pDividerThumbBitmap; if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) { + pThumbBitmap = __pDividerThumbBitmap; if ((positionX >= dividerPosition) && (positionX <= dividerPosition + pThumbBitmap->GetWidthF())) { @@ -138,6 +137,7 @@ _SplitPanelPresenter::CheckDividerTouchRegion(float positionX, float positionY) } else { + pThumbBitmap = __pDividerThumbBitmap; if ((positionY >= dividerPosition) && (positionY <= dividerPosition + pThumbBitmap->GetHeightF())) { @@ -195,7 +195,6 @@ _SplitPanelPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& tou } point = touchinfo.GetCurrentPosition(); - pThumbBitmap = __pDividerThumbBitmap; if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) { @@ -206,6 +205,8 @@ _SplitPanelPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& tou return false; } + pThumbBitmap = __pDividerThumbBitmap; + if (point.x <= __pSplitPanel->GetBoundsF().width - pThumbBitmap->GetWidthF()) { __pSplitPanel->SetDividerPosition(point.x); @@ -220,6 +221,8 @@ _SplitPanelPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& tou return false; } + pThumbBitmap = __pDividerThumbBitmap; + if (point.y <= __pSplitPanel->GetBoundsF().height - pThumbBitmap->GetHeightF()) { __pSplitPanel->SetDividerPosition(point.y); @@ -239,7 +242,6 @@ _SplitPanelPresenter::OnTouchCanceled(const _Control& source, const _TouchInfo& if (__splitPanelDividerPressed == true) { __splitPanelDividerPressed = false; - Draw(); } @@ -294,7 +296,7 @@ _SplitPanelPresenter::MaximizePane(SplitPanelPaneOrder paneOrder) { return E_SUCCESS; } - else if (GetTransactionStatus() == ANIMATION_TRANSACTION_STATUS_PLAYING) + else if (GetAnimationStatus() == ANIMATOR_STATUS_PLAYING) { AnimationTransaction::Stop(__transactionIdMaximize); AnimationTransaction::Stop(__transactionIdRestore); @@ -302,6 +304,8 @@ _SplitPanelPresenter::MaximizePane(SplitPanelPaneOrder paneOrder) RecalcSplitPanel(); + ChangePaneOrder(paneOrder); + AnimationTransaction::Begin(__transactionIdMaximize); if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) @@ -311,9 +315,6 @@ _SplitPanelPresenter::MaximizePane(SplitPanelPaneOrder paneOrder) r = AnimateDivider(_SPLIT_PANEL_ANIMATION_RIGHT); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePaneParent(_SPLIT_PANEL_ANIMATION_RIGHT); - SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePane(_SPLIT_PANEL_ANIMATION_RIGHT); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); } @@ -322,9 +323,6 @@ _SplitPanelPresenter::MaximizePane(SplitPanelPaneOrder paneOrder) r = AnimateDivider(_SPLIT_PANEL_ANIMATION_LEFT); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePaneParent(_SPLIT_PANEL_ANIMATION_LEFT); - SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePane(_SPLIT_PANEL_ANIMATION_LEFT); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); } @@ -336,9 +334,6 @@ _SplitPanelPresenter::MaximizePane(SplitPanelPaneOrder paneOrder) r = AnimateDivider(_SPLIT_PANEL_ANIMATION_BOTTOM); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePaneParent(_SPLIT_PANEL_ANIMATION_BOTTOM); - SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePane(_SPLIT_PANEL_ANIMATION_BOTTOM); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); } @@ -347,9 +342,6 @@ _SplitPanelPresenter::MaximizePane(SplitPanelPaneOrder paneOrder) r = AnimateDivider(_SPLIT_PANEL_ANIMATION_TOP); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePaneParent(_SPLIT_PANEL_ANIMATION_TOP); - SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePane(_SPLIT_PANEL_ANIMATION_TOP); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); } @@ -389,7 +381,7 @@ _SplitPanelPresenter::RestorePane(void) { return E_SUCCESS; } - else if (GetTransactionStatus() == ANIMATION_TRANSACTION_STATUS_PLAYING) + else if (GetAnimationStatus() == ANIMATOR_STATUS_PLAYING) { AnimationTransaction::Stop(__transactionIdMaximize); AnimationTransaction::Stop(__transactionIdRestore); @@ -404,9 +396,6 @@ _SplitPanelPresenter::RestorePane(void) r = AnimateDivider(_SPLIT_PANEL_ANIMATION_RESTORE_VERTICAL); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePaneParent(_SPLIT_PANEL_ANIMATION_RESTORE_VERTICAL); - SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePane(_SPLIT_PANEL_ANIMATION_RESTORE_VERTICAL); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); } @@ -415,9 +404,6 @@ _SplitPanelPresenter::RestorePane(void) r = AnimateDivider(_SPLIT_PANEL_ANIMATION_RESTORE_HORIZONTAL); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePaneParent(_SPLIT_PANEL_ANIMATION_RESTORE_HORIZONTAL); - SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); - r = AnimatePane(_SPLIT_PANEL_ANIMATION_RESTORE_HORIZONTAL); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r)); } @@ -437,59 +423,55 @@ CATCH: result _SplitPanelPresenter::Draw(void) { - if (__pSplitPanelModel->GetPaneMaximumState() == false && GetTransactionStatus() == ANIMATION_TRANSACTION_STATUS_STOPPED) + if (__pSplitPanelModel->GetPaneMaximumState() == false && GetAnimationStatus() == ANIMATOR_STATUS_STOPPED) { FloatRectangle dividerBounds(0.0f, 0.0f, 0.0f, 0.0f); FloatRectangle dividerThumbBounds(0.0f, 0.0f, 0.0f, 0.0f); - Canvas* pCanvas = null; //adjust divider rectangle AdjustDividerRectangle(); - pCanvas = __pSplitPanel->GetDividerVisualElement()->GetCanvasN(); + Canvas* pCanvas = __pSplitPanel->GetDividerVisualElement()->GetCanvasN(); SysTryReturnResult(NID_UI_CTRL, pCanvas != null, GetLastResult(), "Propagating."); - if (pCanvas) - { - pCanvas->Clear(); + pCanvas->Clear(); - //resize pane - SetPaneBounds(); + //resize pane + SetPaneBounds(); - dividerBounds = __dividerRectangle; - dividerBounds.x = 0.0f; - dividerBounds.y = 0.0f; + dividerBounds = __dividerRectangle; + dividerBounds.x = 0.0f; + dividerBounds.y = 0.0f; - if (__splitPanelDividerPressed == true) + if (__splitPanelDividerPressed == true) + { + pCanvas->DrawNinePatchedBitmap(dividerBounds, *__pDividerPressedBackgroundBitmap); + } + else + { + pCanvas->DrawNinePatchedBitmap(dividerBounds, *__pDividerBackgroundBitmap); + } + + //draw divider + pCanvas->DrawNinePatchedBitmap(dividerBounds, *__pDividerBackgroundEffectBitmap); + + //draw divider thumb + if (__pSplitPanelModel->GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) + { + dividerThumbBounds = __dividerThumbRectangle; + if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) { - pCanvas->DrawNinePatchedBitmap(dividerBounds, *__pDividerPressedBackgroundBitmap); + dividerThumbBounds.x = 0.0f; } else { - pCanvas->DrawNinePatchedBitmap(dividerBounds, *__pDividerBackgroundBitmap); - } - - //draw divider - pCanvas->DrawNinePatchedBitmap(dividerBounds, *__pDividerBackgroundEffectBitmap); - - //draw divider thumb - if (__pSplitPanelModel->GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) - { - dividerThumbBounds = __dividerThumbRectangle; - if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) - { - dividerThumbBounds.x = 0.0f; - } - else - { - dividerThumbBounds.y = 0.0f; - } - - pCanvas->DrawBitmap(dividerThumbBounds, *__pDividerThumbBitmap); + dividerThumbBounds.y = 0.0f; } - delete pCanvas; + pCanvas->DrawBitmap(dividerThumbBounds, *__pDividerThumbBitmap); } + + delete pCanvas; } return E_SUCCESS; @@ -509,7 +491,6 @@ _SplitPanelPresenter::LoadBitmap(SplitPanelDividerDirection splitPanelDividerDir { r = GET_BITMAP_CONFIG_N(SPLITPANEL::VERTICAL_DIVIDER_BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pDividerBackgroundEffectBitmap); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Failed to load bitmap.", GetErrorMessage(r)); - r = GET_BITMAP_CONFIG_N(SPLITPANEL::VERTICAL_DIVIDER_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDividerThumbBitmap); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Failed to load bitmap.", GetErrorMessage(r)); } @@ -517,16 +498,17 @@ _SplitPanelPresenter::LoadBitmap(SplitPanelDividerDirection splitPanelDividerDir { r = GET_BITMAP_CONFIG_N(SPLITPANEL::HORIZONTAL_DIVIDER_BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pDividerBackgroundEffectBitmap); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Failed to load bitmap.", GetErrorMessage(r)); - r = GET_BITMAP_CONFIG_N(SPLITPANEL::HORIZONTAL_DIVIDER_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDividerThumbBitmap); SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Failed to load bitmap.", GetErrorMessage(r)); } __pDividerPressedBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDividerBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __dividerPressedBackgroundColor); - SysTryCatch(NID_UI_CTRL, (__pDividerPressedBackgroundBitmap != null), , r, "[%s] Failed to get replacement color bitmap.", GetErrorMessage(GetLastResult())); + r = GetLastResult(); + SysTryCatch(NID_UI_CTRL, (__pDividerPressedBackgroundBitmap != null), , r, "[%s] Failed to get replacement color bitmap.", GetErrorMessage(r)); __pDividerBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDividerBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __dividerBackgroundColor); - SysTryCatch(NID_UI_CTRL, (__pDividerBackgroundBitmap != null), , r, "[%s] Failed to get replacement color bitmap.", GetErrorMessage(GetLastResult())); + r = GetLastResult(); + SysTryCatch(NID_UI_CTRL, (__pDividerBackgroundBitmap != null), , r, "[%s] Failed to get replacement color bitmap.", GetErrorMessage(r)); delete pDividerBackgroundBitmap; @@ -566,7 +548,6 @@ void _SplitPanelPresenter::OnBoundsChanged(void) { RecalcSplitPanel(); - return; } @@ -588,16 +569,12 @@ _SplitPanelPresenter::SetPaneBounds(void) FloatPoint panePostion(0.0f, 0.0f); _Control* pFirstPane = null; _Control* pSecondPane = null; - _Control* pFirstPaneParent = null; - _Control* pSecondPaneParent = null; clientBounds = __pSplitPanel->GetBoundsF(); pFirstPane = __pSplitPanel->GetPane(SPLIT_PANEL_PANE_ORDER_FIRST); - pSecondPane = __pSplitPanel->GetPane(SPLIT_PANEL_PANE_ORDER_SECOND); - pFirstPaneParent = __pSplitPanel->GetPaneParent(SPLIT_PANEL_PANE_ORDER_FIRST); - pSecondPaneParent = __pSplitPanel->GetPaneParent(SPLIT_PANEL_PANE_ORDER_SECOND); + pSecondPane = __pSplitPanel->GetPane(SPLIT_PANEL_PANE_ORDER_SECOND); clientBounds.x = clientBounds.y = 0.0f; @@ -641,40 +618,34 @@ _SplitPanelPresenter::SetPaneBounds(void) } } - if (pFirstPaneParent != null) - { - r = pFirstPaneParent->SetBounds(firstPaneBounds); - SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - } - - if (pSecondPaneParent != null) - { - r = pSecondPaneParent->SetBounds(secondPaneBounds); - SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - } - //set Pane bounds if (pFirstPane != null) { - if (pFirstPane->IsResizable()) + r = pFirstPane->SetBounds(firstPaneBounds); + + if (r != E_SUCCESS) { - r = pFirstPane->SetBounds(firstPaneBounds); - SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + panePostion.x = firstPaneBounds.x; + panePostion.y = firstPaneBounds.y; + + r = pFirstPane->SetPosition(panePostion); } - - r = pFirstPane->SetPosition(Point(0.0f, 0.0f)); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } if (pSecondPane != null) { - if (pSecondPane->IsResizable()) + r = pSecondPane->SetBounds(secondPaneBounds); + + if (r != E_SUCCESS) { - r = pSecondPane->SetBounds(secondPaneBounds); - SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - } + panePostion.x = secondPaneBounds.x; + panePostion.y = secondPaneBounds.y; - r = pSecondPane->SetPosition(Point(0.0f, 0.0f)); + r = pSecondPane->SetPosition(panePostion); + } + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } @@ -685,9 +656,6 @@ _SplitPanelPresenter::SetPaneBounds(void) __setFirstDividerPositionChangeEvent = false; __pSplitPanel->SendSplitPanelEvent(_SPLIT_PANEL_EVENT_DIVIDER_POSITION_CHANGE); } - - pFirstPane->Invalidate(true); - pSecondPane->Invalidate(true); } return r; @@ -708,24 +676,22 @@ _SplitPanelPresenter::AdjustDividerRectangle(void) dividerPosition = __pSplitPanel->GetDividerPosition(); clientBounds = __pSplitPanel->GetBoundsF(); - pThumbBitmap = __pDividerThumbBitmap; - - if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) - { - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, width); - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, height); - } - else - { - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, width); - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, height); - } - if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) { + pThumbBitmap = __pDividerThumbBitmap; + + if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) + { + GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, width); + } + else + { + GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, width); + } + height = clientBounds.height; - if (height > 0.0f) + if (height > 0) { __dividerRectangle = FloatRectangle(dividerPosition, 0.0f, width, height); __dividerThumbRectangle = FloatRectangle(dividerPosition, ((height - pThumbBitmap->GetHeightF()) / 2.0f), pThumbBitmap->GetWidthF(), pThumbBitmap->GetHeightF()); @@ -733,6 +699,17 @@ _SplitPanelPresenter::AdjustDividerRectangle(void) } else { + pThumbBitmap = __pDividerThumbBitmap; + + if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) + { + GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, height); + } + else + { + GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, height); + } + width = clientBounds.width; if (width > 0.0f) @@ -745,34 +722,84 @@ _SplitPanelPresenter::AdjustDividerRectangle(void) __pSplitPanel->SetDividerVisualElementBounds(__dividerRectangle); } +void +_SplitPanelPresenter::ChangePaneOrder(SplitPanelPaneOrder paneOrder) +{ + result r = E_SUCCESS; + _Control* pFirstPane = null; + _Control* pSecondPane = null; + + if (paneOrder == SPLIT_PANEL_PANE_ORDER_FIRST) + { + pFirstPane = __pSplitPanel->GetPane(SPLIT_PANEL_PANE_ORDER_FIRST); + SysTryReturnVoidResult(NID_UI_CTRL, pFirstPane != null, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r)); + + r = __pSplitPanel->DetachChild(*pFirstPane); + SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + + r = __pSplitPanel->AttachChild(*pFirstPane); + SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + } + else + { + pSecondPane = __pSplitPanel->GetPane(SPLIT_PANEL_PANE_ORDER_SECOND); + SysTryReturnVoidResult(NID_UI_CTRL, pSecondPane != null, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(r)); + + r = __pSplitPanel->DetachChild(*pSecondPane); + SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + + r = __pSplitPanel->AttachChild(*pSecondPane); + SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); + } + + return; +} + result _SplitPanelPresenter::AnimateDivider(int destination) { result r = E_SUCCESS; FloatRectangle dividerBoundsStart(0.0f, 0.0f, 0.0f, 0.0f); FloatRectangle dividerBoundsEnd(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle dividerBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle clientBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle firstPaneBounds(0.0f, 0.0f, 0.0f, 0.0f); - _Control* pFirstPaneParent = null; + FloatRectangle dividerBounds(0, 0, 0, 0); + FloatRectangle clientBounds(0, 0, 0, 0); + FloatRectangle firstPaneBounds(0, 0, 0, 0); + Control* pFirstPanelControl = null; VisualElement* pVisualElementDivider = null; VisualElementPropertyAnimation* pAnimationDivider = null; - pFirstPaneParent = __pSplitPanel->GetPaneParent(SPLIT_PANEL_PANE_ORDER_FIRST); - SysTryReturnResult(NID_UI_CTRL, pFirstPaneParent != null, GetLastResult(), "Propagating."); + const IVisualElementAnimationTimingFunction* pTimingFunction = VisualElementAnimation::GetTimingFunctionByName(__visualElementAnimationInterpolator); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pTimingFunction != null, r, "Propagating."); + + pFirstPanelControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_FIRST); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pFirstPanelControl != null, r, "Propagating."); pVisualElementDivider = __pSplitPanel->GetDividerVisualElement(); - SysTryReturnResult(NID_UI_CTRL, pVisualElementDivider != null, GetLastResult(), "Propagating."); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pVisualElementDivider != null, r, "Propagating."); pVisualElementDivider->RemoveAllAnimations(); - SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, GetLastResult(), "Propagating."); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + pAnimationDivider = new (std::nothrow) VisualElementPropertyAnimation(); + SysTryReturnResult(NID_UI_CTRL, pAnimationDivider != null, E_OUT_OF_MEMORY, " Memory allocation failed.") + + r = pAnimationDivider->SetPropertyName(L"bounds"); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); + + r = pAnimationDivider->SetDuration(ANIMATION_DURATION); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - pAnimationDivider = GetVisualElementAnimation(L"bounds"); - SysTryReturnResult(NID_UI_CTRL, pAnimationDivider != null, GetLastResult(), "Propagating."); + pAnimationDivider->SetTimingFunction(pTimingFunction); + r = GetLastResult(); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); dividerBounds = pVisualElementDivider->GetBounds(); clientBounds = __pSplitPanel->GetBoundsF(); - firstPaneBounds = pFirstPaneParent->GetBoundsF(); + firstPaneBounds = pFirstPanelControl->GetBoundsF(); dividerBoundsStart = dividerBounds; clientBounds.x = clientBounds.y = 0.0f; @@ -853,39 +880,51 @@ _SplitPanelPresenter::AnimateDivider(int destination) SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); pVisualElementDivider->AddAnimation(L"Bounds", *pAnimationDivider); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , GetLastResult(), "Propagating."); + r = GetLastResult(); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); CATCH: delete pAnimationDivider; - return r; + } result _SplitPanelPresenter::AnimatePane(int destination) { + result r = E_SUCCESS; Rectangle clientBounds(0, 0, 0, 0); Rectangle firstPaneBounds(0, 0, 0, 0); Rectangle secondPaneBounds(0, 0, 0, 0); Rectangle dividerRectangle(0, 0, 0, 0); - Control* pFirstPaneControl = null; - Control* pSecondPaneControl = null; + Control* pFirstPanelControl = null; + Control* pSecondPanelControl = null; ControlAnimator* pControlAnimatorFirstPane = null; ControlAnimator* pControlAnimatorSecondPane = null; - FloatAnimation hidePane(ANIMATION_ALPHA_SHOW, ANIMATION_ALPHA_HIDE, ANIMATION_DURATION, __controlAnimatorInterpolator); - FloatAnimation showPane(ANIMATION_ALPHA_HIDE, ANIMATION_ALPHA_SHOW, ANIMATION_DURATION, __controlAnimatorInterpolator); + FloatAnimation animationHidePane = FloatAnimation(ANIMATION_ALPHA_SHOW, ANIMATION_ALPHA_HIDE, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + FloatAnimation animationShowPane = FloatAnimation(ANIMATION_ALPHA_HIDE, ANIMATION_ALPHA_SHOW, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - pFirstPaneControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_FIRST); - pSecondPaneControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_SECOND); + pFirstPanelControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_FIRST); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pFirstPanelControl != null, r, "Propagating."); - pControlAnimatorFirstPane = pFirstPaneControl->GetControlAnimator(); - pControlAnimatorSecondPane = pSecondPaneControl->GetControlAnimator(); + pSecondPanelControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_SECOND); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pSecondPanelControl != null, r, "Propagating."); + + pControlAnimatorFirstPane = pFirstPanelControl->GetControlAnimator(); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pControlAnimatorFirstPane != null, r, "Propagating."); + + pControlAnimatorSecondPane = pSecondPanelControl->GetControlAnimator(); + r = GetLastResult(); + SysTryReturnResult(NID_UI_CTRL, pControlAnimatorSecondPane != null, r, "Propagating."); clientBounds = __pSplitPanel->GetBounds(); - firstPaneBounds = pFirstPaneControl->GetBounds(); - secondPaneBounds = pSecondPaneControl->GetBounds(); + firstPaneBounds = pFirstPanelControl->GetBounds(); + secondPaneBounds = pSecondPanelControl->GetBounds(); clientBounds.x = clientBounds.y = 0; @@ -896,92 +935,108 @@ _SplitPanelPresenter::AnimatePane(int destination) case _SPLIT_PANEL_ANIMATION_RIGHT: { Rectangle secondPaneEndBounds = secondPaneBounds; - secondPaneEndBounds.x = clientBounds.width + dividerRectangle.width; + secondPaneEndBounds.x = clientBounds.x + clientBounds.width + dividerRectangle.width; - RectangleAnimation maximizeFirstPane = RectangleAnimation(firstPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); + RectangleAnimation animationMaximizeFirstPane = RectangleAnimation(firstPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + RectangleAnimation animationMinimizeSecondPane = RectangleAnimation(secondPaneBounds, secondPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - if (pControlAnimatorFirstPane && pFirstPaneControl->IsResizable()) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, maximizeFirstPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMaximizeFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorFirstPane && pFirstPaneControl->GetShowState() == false) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationMaximizeFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorSecondPane && pSecondPaneControl->GetShowState() == true) + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMinimizeSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationHidePane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + if (pFirstPanelControl->GetShowState() == false) { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, hidePane); + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } } break; case _SPLIT_PANEL_ANIMATION_LEFT: { Rectangle firstPaneEndBounds = firstPaneBounds; - firstPaneEndBounds.x = -(firstPaneBounds.width + dividerRectangle.width); + firstPaneEndBounds.x = clientBounds.x - firstPaneBounds.width - dividerRectangle.width; - RectangleAnimation animationMaximizeSecondPane = RectangleAnimation(secondPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); + RectangleAnimation animationMaximizeSecondPane = RectangleAnimation(secondPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + RectangleAnimation animationMinimizeFirstPane = RectangleAnimation(firstPaneBounds, firstPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - if (pControlAnimatorSecondPane && pSecondPaneControl->IsResizable()) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationMaximizeSecondPane); - } + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMaximizeSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorSecondPane && pSecondPaneControl->GetShowState() == false) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationMaximizeSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMinimizeFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationHidePane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorFirstPane && pFirstPaneControl->GetShowState() == true) + if (pSecondPanelControl->GetShowState() == false) { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, hidePane); + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } } break; case _SPLIT_PANEL_ANIMATION_TOP: { Rectangle firstPaneEndBounds = firstPaneBounds; - firstPaneEndBounds.y = -(firstPaneBounds.height + dividerRectangle.height); + firstPaneEndBounds.y = clientBounds.y - firstPaneBounds.height - dividerRectangle.height; - RectangleAnimation animationMaximizeSecondPane = RectangleAnimation(secondPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); + RectangleAnimation animationMaximizeSecondPane = RectangleAnimation(secondPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + RectangleAnimation animationMinimizeFirstPane = RectangleAnimation(firstPaneBounds, firstPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - if (pControlAnimatorSecondPane && pSecondPaneControl->IsResizable()) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationMaximizeSecondPane); - } + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMaximizeSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorSecondPane && pSecondPaneControl->GetShowState() == false) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationMaximizeSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMinimizeFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationHidePane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorFirstPane && pFirstPaneControl->GetShowState() == true) + if (pSecondPanelControl->GetShowState() == false) { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, hidePane); + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } } break; case _SPLIT_PANEL_ANIMATION_BOTTOM: { Rectangle secondPaneEndBounds = secondPaneBounds; - secondPaneEndBounds.y = clientBounds.height + dividerRectangle.height; + secondPaneEndBounds.y = clientBounds.y + clientBounds.height + dividerRectangle.height; - RectangleAnimation maximizeFirstPane = RectangleAnimation(firstPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); + RectangleAnimation animationMaximizeFirstPane = RectangleAnimation(firstPaneBounds, clientBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + RectangleAnimation animationMinimizeSecondPane = RectangleAnimation(secondPaneBounds, secondPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - if (pControlAnimatorFirstPane && pFirstPaneControl->IsResizable()) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, maximizeFirstPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMaximizeFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorFirstPane && pFirstPaneControl->GetShowState() == false) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationMaximizeFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationMinimizeSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorSecondPane && pSecondPaneControl->GetShowState() == true) + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationHidePane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + if (pFirstPanelControl->GetShowState() == false) { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, hidePane); + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } } break; @@ -990,34 +1045,32 @@ _SplitPanelPresenter::AnimatePane(int destination) Rectangle firstPaneEndBounds = _CoordinateSystemUtils::ConvertToInteger(GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_FIRST)); Rectangle secondPaneEndBounds = _CoordinateSystemUtils::ConvertToInteger(GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_SECOND)); - secondPaneEndBounds.x = secondPaneEndBounds.y = 0; + RectangleAnimation animationRestoreFirstPane = RectangleAnimation(firstPaneBounds, firstPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + RectangleAnimation animationRestoreSecondPane = RectangleAnimation(secondPaneBounds, secondPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - RectangleAnimation animationRestoreFirstPane = RectangleAnimation(firstPaneBounds, firstPaneEndBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); - RectangleAnimation animationRestoreSecondPane = RectangleAnimation(secondPaneBounds, secondPaneEndBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); + // Restore Pane 1 + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorFirstPane && pFirstPaneControl->IsResizable()) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreFirstPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationRestoreFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorSecondPane && pSecondPaneControl->IsResizable()) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreSecondPane); - } + // Restore Pane 2 + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationRestoreSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); if (__pSplitPanelModel->GetMaximizedPaneOrder() == SPLIT_PANEL_PANE_ORDER_FIRST) { - if (pControlAnimatorSecondPane && pSecondPaneControl->GetShowState() == false) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } else { - if (pControlAnimatorFirstPane && pFirstPaneControl->GetShowState() == false) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } } break; @@ -1026,34 +1079,32 @@ _SplitPanelPresenter::AnimatePane(int destination) Rectangle firstPaneEndBounds = _CoordinateSystemUtils::ConvertToInteger(GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_FIRST)); Rectangle secondPaneEndBounds = _CoordinateSystemUtils::ConvertToInteger(GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_SECOND)); - secondPaneEndBounds.x = secondPaneEndBounds.y = 0; + RectangleAnimation animationRestoreFirstPane = RectangleAnimation(firstPaneBounds, firstPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); + RectangleAnimation animationRestoreSecondPane = RectangleAnimation(secondPaneBounds, secondPaneEndBounds, ANIMATION_DURATION, __controlAnimatorAnimationInterpolator); - RectangleAnimation animationRestoreFirstPane = RectangleAnimation(firstPaneBounds, firstPaneEndBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); - RectangleAnimation animationRestoreSecondPane = RectangleAnimation(secondPaneBounds, secondPaneEndBounds, ANIMATION_DURATION, __controlAnimatorInterpolator); + // Restore Pane 1 + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorFirstPane && pFirstPaneControl->IsResizable()) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreFirstPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationRestoreFirstPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); - if (pControlAnimatorSecondPane && pSecondPaneControl->IsResizable()) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreSecondPane); - } + // Restore Pane 2 + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_SIZE, animationRestoreSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); + + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_POSITION, animationRestoreSecondPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); if (__pSplitPanelModel->GetMaximizedPaneOrder() == SPLIT_PANEL_PANE_ORDER_FIRST) { - if (pControlAnimatorSecondPane && pSecondPaneControl->GetShowState() == false) - { - pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorSecondPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } else { - if (pControlAnimatorFirstPane && pFirstPaneControl->GetShowState() == false) - { - pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, showPane); - } + r = pControlAnimatorFirstPane->StartUserAnimation(ANIMATION_TARGET_ALPHA, animationShowPane); + SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Propagating."); } } break; @@ -1062,163 +1113,6 @@ _SplitPanelPresenter::AnimatePane(int destination) return E_SUCCESS; } -result -_SplitPanelPresenter::AnimatePaneParent(int destination) -{ - result r = E_SUCCESS; - _Control* pFirstPane = null; - _Control* pSecondPane = null; - VisualElement* pVEFirstPane = null; - VisualElement* pVESecondPane = null; - VisualElementPropertyAnimation* pAnimationFirstPane = null; - VisualElementPropertyAnimation* pAnimationSecondPane = null; - - FloatRectangle clientBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle firstPaneBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle secondPaneBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle dividerRectangle(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle firstPaneStartBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle firstPaneEndBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle secondPaneStartBounds(0.0f, 0.0f, 0.0f, 0.0f); - FloatRectangle secondPaneEndBounds(0.0f, 0.0f, 0.0f, 0.0f); - - pFirstPane = __pSplitPanel->GetPaneParent(SPLIT_PANEL_PANE_ORDER_FIRST); - pSecondPane = __pSplitPanel->GetPaneParent(SPLIT_PANEL_PANE_ORDER_SECOND); - - if (pFirstPane) - { - pVEFirstPane = pFirstPane->GetVisualElement(); - SysTryReturnResult(NID_UI_CTRL, pVEFirstPane != null, GetLastResult(), "Propagating."); - - pVEFirstPane->RemoveAllAnimations(); - } - - if (pSecondPane) - { - pVESecondPane = pSecondPane->GetVisualElement(); - SysTryReturnResult(NID_UI_CTRL, pVESecondPane != null, GetLastResult(), "Propagating."); - - pVESecondPane->RemoveAllAnimations(); - } - - pAnimationFirstPane = GetVisualElementAnimation(L"bounds"); - SysTryReturnResult(NID_UI_CTRL, pAnimationFirstPane != null, GetLastResult(), "Propagating."); - - pAnimationSecondPane = GetVisualElementAnimation(L"bounds"); - SysTryReturnResult(NID_UI_CTRL, pAnimationSecondPane != null, GetLastResult(), "Propagating."); - - clientBounds = __pSplitPanel->GetBoundsF(); - firstPaneBounds = pFirstPane->GetBoundsF(); - secondPaneBounds = pSecondPane->GetBoundsF(); - - clientBounds.x = clientBounds.y = 0.0f; - - dividerRectangle = __dividerRectangle; - - switch (destination) - { - case _SPLIT_PANEL_ANIMATION_RIGHT: - { - firstPaneStartBounds = firstPaneBounds; - firstPaneEndBounds = clientBounds; - - secondPaneStartBounds = secondPaneBounds; - secondPaneEndBounds = secondPaneBounds; - secondPaneEndBounds.x = clientBounds.width + dividerRectangle.width; - } - break; - case _SPLIT_PANEL_ANIMATION_LEFT: - { - firstPaneStartBounds = firstPaneBounds; - firstPaneEndBounds = firstPaneBounds; - firstPaneEndBounds.x = -(firstPaneBounds.width + dividerRectangle.width); - - secondPaneStartBounds = secondPaneBounds; - secondPaneEndBounds = clientBounds; - } - break; - case _SPLIT_PANEL_ANIMATION_TOP: - { - firstPaneStartBounds = firstPaneBounds; - firstPaneEndBounds = firstPaneBounds; - firstPaneEndBounds.y = -(firstPaneBounds.height + dividerRectangle.height); - - secondPaneStartBounds = secondPaneBounds; - secondPaneEndBounds = clientBounds; - } - break; - case _SPLIT_PANEL_ANIMATION_BOTTOM: - { - firstPaneStartBounds = firstPaneBounds; - firstPaneEndBounds = clientBounds; - - secondPaneStartBounds = secondPaneBounds; - secondPaneEndBounds = secondPaneBounds; - secondPaneEndBounds.y = clientBounds.height + dividerRectangle.height; - } - break; - case _SPLIT_PANEL_ANIMATION_RESTORE_HORIZONTAL: - { - firstPaneStartBounds = firstPaneBounds; - firstPaneEndBounds = GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_FIRST); - - secondPaneStartBounds = secondPaneBounds; - secondPaneEndBounds = GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_SECOND); - } - break; - case _SPLIT_PANEL_ANIMATION_RESTORE_VERTICAL: - { - firstPaneStartBounds = firstPaneBounds; - firstPaneEndBounds = GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_FIRST); - - secondPaneStartBounds = secondPaneBounds; - secondPaneEndBounds = GetRestorePaneBounds(SPLIT_PANEL_PANE_ORDER_SECOND); - } - break; - } - - if (pFirstPane) - { - r = pAnimationFirstPane->SetStartValue(firstPaneStartBounds); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - - r = pAnimationFirstPane->SetEndValue(firstPaneEndBounds); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - - pFirstPane->SetBounds(firstPaneEndBounds); - - if (pVEFirstPane) - { - pVEFirstPane->AddAnimation(L"Bounds", *pAnimationFirstPane); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , GetLastResult(), "Propagating."); - } - } - - if (pSecondPane) - { - r = pAnimationSecondPane->SetStartValue(secondPaneStartBounds); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - - r = pAnimationSecondPane->SetEndValue(secondPaneEndBounds); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - - pSecondPane->SetBounds(secondPaneEndBounds); - - if (pVESecondPane) - { - pVESecondPane->AddAnimation(L"Bounds", *pAnimationSecondPane); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , GetLastResult(), "Propagating."); - } - } - -CATCH: - - delete pAnimationFirstPane; - delete pAnimationSecondPane; - - return r; -} - Control* _SplitPanelPresenter::GetPaneControl(SplitPanelPaneOrder paneOrder) { @@ -1235,21 +1129,38 @@ _SplitPanelPresenter::GetPaneControl(SplitPanelPaneOrder paneOrder) SplitPanel& splitPanelPublic = pSplitPanelImpl->GetPublic(); pControl = splitPanelPublic.GetPane(paneOrder); - SysTryReturn(NID_UI_CTRL, pControl != null, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult())); + SysTryReturn(NID_UI_CTRL, pControl != null, null, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(GetLastResult())); return pControl; } -AnimationTransactionStatus -_SplitPanelPresenter::GetTransactionStatus(void) +AnimatorStatus +_SplitPanelPresenter::GetAnimationStatus(void) { - if (AnimationTransaction::GetStatus(__transactionIdMaximize) == ANIMATION_TRANSACTION_STATUS_STOPPED && - AnimationTransaction::GetStatus(__transactionIdRestore) == ANIMATION_TRANSACTION_STATUS_STOPPED) + result r = E_SUCCESS; + + Control* pFirstPanelControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_FIRST); + r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, pFirstPanelControl != null, ANIMATOR_STATUS_STOPPED, r, "[%s] Propagating.", GetErrorMessage(r)); + + Control* pSecondPanelControl = GetPaneControl(SPLIT_PANEL_PANE_ORDER_SECOND); + r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, pSecondPanelControl != null, ANIMATOR_STATUS_STOPPED, r, "[%s] Propagating.", GetErrorMessage(r)); + + ControlAnimator* pControlAnimatorFirstPane = pFirstPanelControl->GetControlAnimator(); + r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, ANIMATOR_STATUS_STOPPED, r, "[%s] Propagating.", GetErrorMessage(r)); + + ControlAnimator* pControlAnimatorSecondPane = pSecondPanelControl->GetControlAnimator(); + r = GetLastResult(); + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, ANIMATOR_STATUS_STOPPED, r, "[%s] Propagating.", GetErrorMessage(r)); + + if (pControlAnimatorFirstPane->GetStatus() == ANIMATOR_STATUS_STOPPED && pControlAnimatorSecondPane->GetStatus() == ANIMATOR_STATUS_STOPPED) { - return ANIMATION_TRANSACTION_STATUS_STOPPED; + return ANIMATOR_STATUS_STOPPED; } - return ANIMATION_TRANSACTION_STATUS_PLAYING; + return ANIMATOR_STATUS_PLAYING; } FloatRectangle @@ -1257,32 +1168,27 @@ _SplitPanelPresenter::GetRestorePaneBounds(SplitPanelPaneOrder paneOrder) { float width = 0.0f; float height = 0.0f; - float dividerPosition = 0.0f; - FloatRectangle clientBounds(0.0f, 0.0f, 0.0f, 0.0f); FloatRectangle firstPaneBounds(0.0f, 0.0f, 0.0f, 0.0f); FloatRectangle secondPaneBounds(0.0f, 0.0f, 0.0f, 0.0f); - _ControlOrientation orientation = _CONTROL_ORIENTATION_PORTRAIT; - dividerPosition = __pSplitPanel->GetDividerPosition(); + float dividerPosition = __pSplitPanel->GetDividerPosition(); - clientBounds = __pSplitPanel->GetBoundsF(); + FloatRectangle clientBounds = __pSplitPanel->GetBoundsF(); - orientation = _ControlManager::GetInstance()->GetOrientation(); - - if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) - { - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, width); - GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, height); - } - else - { - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, width); - GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, height); - } + _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); if (__pSplitPanel->GetDividerDirection() == SPLIT_PANEL_DIVIDER_DIRECTION_VERTICAL) { + if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) + { + GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, width); + } + else + { + GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, width); + } + height = clientBounds.height; if (height > 0.0f) @@ -1292,6 +1198,15 @@ _SplitPanelPresenter::GetRestorePaneBounds(SplitPanelPaneOrder paneOrder) } else { + if (GetDividerStyle() == SPLIT_PANEL_DIVIDER_STYLE_MOVABLE) + { + GET_SHAPE_CONFIG(SPLITPANEL::MOVABLE_DIVIDER_THICKNESS, orientation, height); + } + else + { + GET_SHAPE_CONFIG(SPLITPANEL::FIXED_DIVIDER_THICKNESS, orientation, height); + } + width = clientBounds.width; if (width > 0.0f) @@ -1319,33 +1234,4 @@ _SplitPanelPresenter::GetRestorePaneBounds(SplitPanelPaneOrder paneOrder) return secondPaneBounds; } -VisualElementPropertyAnimation* -_SplitPanelPresenter::GetVisualElementAnimation(Tizen::Base::String propertyName) -{ - result r = E_SUCCESS; - VisualElementPropertyAnimation* pAnimation = null; - - const IVisualElementAnimationTimingFunction* pTimingFunction = VisualElementAnimation::GetTimingFunctionByName(__visualElementInterpolator); - SysTryReturn(NID_UI_CTRL, pTimingFunction != null, null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult())); - - pAnimation = new (std::nothrow) VisualElementPropertyAnimation(); - SysTryReturn(NID_UI_CTRL, pAnimation != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); - - r = pAnimation->SetPropertyName(propertyName); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - - r = pAnimation->SetDuration(ANIMATION_DURATION); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Propagating."); - - pAnimation->SetTimingFunction(pTimingFunction); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , GetLastResult(), "Propagating."); - - return pAnimation; - -CATCH: - delete pAnimation; - - return null; -} - }}} // Tizen::Ui::Controls diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp index 2a886eb..11029fd 100644 --- a/src/ui/controls/FUiCtrl_TableViewItem.cpp +++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp @@ -219,7 +219,6 @@ _TableViewItem::_TableViewItem(float itemHeight) , __isPressedTimerEnabled(false) , __isReleasedTimerEnabled(false) , __pressedControl(TABLE_VIEW_ITEM_PRESSED_NONE) - , __releasedControl(TABLE_VIEW_ITEM_PRESSED_NONE) , __pCheckedTimer(null) , __isCheckedTimerEnabled(false) , __isCheckedAnimationEnabled(false) @@ -1083,37 +1082,11 @@ _TableViewItem::OnTouchPressed(const _Control& source, const _TouchInfo& touchin return true; } - if(__isReleasedTimerEnabled) - { - StopTouchReleasedTimer(); - FireItemTouchReleased(); - } - __annexOnOffHandlerMoved = false; __touchStartPosition = touchinfo.GetCurrentPosition(); // +++ check floating - if (&source == this) - { - __pressedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; - } - else if (&source == __pItemAnnex) - { - __pressedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; - if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING || - __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER) - { - __annexOnOffTouchPosition = touchinfo.GetCurrentPosition().x; // +++ check floating - } - } - else if (IsIndividualSelectionEnabled(source)) - { - __pressedControl = TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL; - } - else - { - __pressedControl = TABLE_VIEW_ITEM_PRESSED_NONE; - } + __itemSelected = true; if (!IsIndividualSelectionEnabled(source)) { @@ -1131,81 +1104,90 @@ _TableViewItem::OnTouchReleased(const _Control& source, const _TouchInfo& touchi return true; } - if (&source == this) - { - __releasedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; - } - else if (&source == __pItemAnnex) - { - __releasedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; - } - else if (IsIndividualSelectionEnabled(source)) - { - __releasedControl = TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL; - } - else + if (__isPressedTimerEnabled) { - __releasedControl = TABLE_VIEW_ITEM_PRESSED_NONE; + StopTouchPressedTimer(); } - if(!__itemTouchMoved && __isPressedTimerEnabled) + if(!__itemTouchMoved && !IsContextItem()) { - StopTouchPressedTimer(); + if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ITEM) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; + SetItemChanged(true); + Invalidate(); + } + else if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) + { + if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; + SetChecked(true); + DrawAnnexStyle(); + } + else if (__annexStyle != TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING && + __annexStyle != TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; + SetItemChanged(true); + Invalidate(); + } + } + else + { + if(__pressedControl != TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; + SetItemChanged(true); + Invalidate(); + } + } - if(!IsContextItem()) + if (&source == this) + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; + } + else if (&source == __pItemAnnex) + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; + } + else if (IsIndividualSelectionEnabled(source)) { - FireItemTouchPressed(); + __pressedControl = TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL; + } + else + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_NONE; } StartTouchReleasedTimer(); + return true; } - FireItemTouchReleased(); - return true; -} - -void -_TableViewItem::FireItemTouchPressed() -{ - __itemSelected = true; - - if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ITEM) + if (&source == this) { - __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; - SetItemChanged(true); - Invalidate(); + __pressedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; } - else if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) + else if (&source == __pItemAnnex) { - if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED) - { - __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; - SetChecked(true); - DrawAnnexStyle(); - } - else if (__annexStyle != TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING && - __annexStyle != TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER) - { - __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; - SetItemChanged(true); - Invalidate(); - } + __pressedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; + } + else if (IsIndividualSelectionEnabled(source)) + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL; } else { - if(__pressedControl != TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL) - { - __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; - SetItemChanged(true); - Invalidate(); - } + __pressedControl = TABLE_VIEW_ITEM_PRESSED_NONE; } + FireItemTouchRelease(); + return true; } void -_TableViewItem::FireItemTouchReleased() +_TableViewItem::FireItemTouchRelease() { bool fireItemEvent = false; bool selectedItem = true; @@ -1217,7 +1199,7 @@ _TableViewItem::FireItemTouchReleased() bool checked = IsChecked(); fireItemEvent = true; - if (__releasedControl == TABLE_VIEW_ITEM_PRESSED_ITEM) + if (__pressedControl == TABLE_VIEW_ITEM_PRESSED_ITEM) { if ((__annexStyle == TABLE_VIEW_ANNEX_STYLE_MARK) || (__annexStyle == TABLE_VIEW_ANNEX_STYLE_RADIO) @@ -1227,7 +1209,7 @@ _TableViewItem::FireItemTouchReleased() SetCheckedAnimationEnabled(!checked); } } - else if(__releasedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) + else if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) { if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED) { @@ -1249,7 +1231,7 @@ _TableViewItem::FireItemTouchReleased() } else { - if(__releasedControl != TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL) + if(__pressedControl != TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL) { if ((__annexStyle == TABLE_VIEW_ANNEX_STYLE_MARK) || (__annexStyle == TABLE_VIEW_ANNEX_STYLE_RADIO) @@ -1271,7 +1253,7 @@ _TableViewItem::FireItemTouchReleased() } else { - if (__releasedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) + if (__pressedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) { if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING || __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER) @@ -1401,7 +1383,7 @@ _TableViewItem::OnPreviewTouchReleased(const _Control& source, const _TouchInfo& _UiTouchEventDelivery _TableViewItem::OnPreviewTouchMoved(const _Control& source, const _TouchInfo& touchinfo) { - return _UI_TOUCH_EVENT_DELIVERY_YES; + return _UI_TOUCH_EVENT_DELIVERY_FORCED_YES; } _UiTouchEventDelivery @@ -1506,12 +1488,43 @@ _TableViewItem::OnTimerExpired(Tizen::Base::Runtime::Timer& timer) else if (&timer == __pPressedTimer) { __isPressedTimerEnabled = false; - FireItemTouchPressed(); + + if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ITEM) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; + SetItemChanged(true); + Invalidate(); + } + else if(__pressedControl == TABLE_VIEW_ITEM_PRESSED_ANNEX) + { + if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_DETAILED) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; + SetChecked(true); + DrawAnnexStyle(); + } + else if (__annexStyle != TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING && + __annexStyle != TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_NORMAL; + SetItemChanged(true); + Invalidate(); + } + } + else + { + if(__pressedControl != TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL) + { + __drawingStatus = TABLE_VIEW_ITEM_DRAWING_STATUS_PRESSED; + SetItemChanged(true); + Invalidate(); + } + } } else if(&timer == __pReleasedTimer) { __isReleasedTimerEnabled = false; - FireItemTouchReleased(); + FireItemTouchRelease(); } } @@ -1535,12 +1548,35 @@ _TableViewItem::StartTouchPressedTimer(const _Control& source, const _TouchInfo& SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage); __isPressedTimerEnabled = true; + + if (&source == this) + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_ITEM; + } + else if (&source == __pItemAnnex) + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_ANNEX; + + if (__annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING || + __annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER) + { + __annexOnOffTouchPosition = touchinfo.GetCurrentPosition().x; // +++ check floating + } + } + else if (IsIndividualSelectionEnabled(source)) + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_INDIVIDUAL; + } + else + { + __pressedControl = TABLE_VIEW_ITEM_PRESSED_NONE; + } } return r; CATCH: - if (__isPressedTimerEnabled && __pPressedTimer != null) + if (__isPressedTimerEnabled) { __pPressedTimer->Cancel(); } @@ -1551,42 +1587,21 @@ CATCH: return r; } -void -_TableViewItem::StopTouchPressedTimer(void) -{ - result r = E_SUCCESS; - - SysTryReturnVoidResult(NID_UI_CTRL, __pPressedTimer != null, E_SYSTEM, "[E_SYSTEM] Timer is invalid."); - - if (__isPressedTimerEnabled) - { - r = __pPressedTimer->Cancel(); - SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); - } - - __isPressedTimerEnabled = false; - - return; -} - result _TableViewItem::StartTouchReleasedTimer() { result r = E_SUCCESS; - if(__pReleasedTimer != null) + if (__pReleasedTimer == null) { - delete __pReleasedTimer; - __pReleasedTimer = null; - } - - __pReleasedTimer = new (std::nothrow) Timer(); - SysTryCatch(NID_UI_CTRL, __pReleasedTimer != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + __pReleasedTimer = new (std::nothrow) Timer(); + SysTryCatch(NID_UI_CTRL, __pReleasedTimer != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); - r = __pReleasedTimer->Construct(*this); - SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage); + r = __pReleasedTimer->Construct(*this); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage); + } - r = __pReleasedTimer->Start(TOUCH_RELEASED_DURATION); + r = __pReleasedTimer->Start(TOUCH_RELREASED_DURATION); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage); __isReleasedTimerEnabled = true; @@ -1606,19 +1621,19 @@ CATCH: } void -_TableViewItem::StopTouchReleasedTimer(void) +_TableViewItem::StopTouchPressedTimer(void) { result r = E_SUCCESS; - SysTryReturnVoidResult(NID_UI_CTRL, __pReleasedTimer != null, E_SYSTEM, "[E_SYSTEM] Timer is invalid."); + SysTryReturnVoidResult(NID_UI_CTRL, __pPressedTimer != null, E_SYSTEM, "[E_SYSTEM] Timer is invalid."); - if (__isReleasedTimerEnabled) + if (__isPressedTimerEnabled) { - r = __pReleasedTimer->Cancel(); + r = __pPressedTimer->Cancel(); SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); } - __isReleasedTimerEnabled = false; + __isPressedTimerEnabled = false; return; } diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp index 76ca821..09cd71c 100644 --- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp @@ -2883,9 +2883,11 @@ _TableViewPresenter::ScrollToInternal(float newPosition) { if (!IsScrollEnabled()) { - return 0.0f; + return 0; } + ResetSweepItem(); + if (IsScrollAnimationRunning()) { if (__scrollPositionOnFlickStarted > newPosition) @@ -3020,7 +3022,6 @@ _TableViewPresenter::ScrollToItem(int groupIndex, int itemIndex, TableViewScroll TableViewItemTag itemPos = {groupIndex, itemIndex}; StopAllItemAnimation(); - ResetSweepItem(); if (!__pListModel->IsLoadedItem(groupIndex, itemIndex)) { @@ -3053,8 +3054,6 @@ _TableViewPresenter::ScrollByPixel(float scrollDistance) result r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - ResetSweepItem(); - ScrollTo(scrollDistance + GetScrollPosition()); r = GetLastResult(); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp index c910c53..4cbcf58 100755 --- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp +++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp @@ -184,7 +184,7 @@ _Token::ResetToken(const String& text) } __pTextBuffer[length] = 0; - pTextObject->RemoveAll(true); + pTextObject->RemoveAll(); TextSimple* pSimpleText = new (std::nothrow)TextSimple(__pTextBuffer, length, TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL, pFont); SysTryCatch(NID_UI_CTRL, pSimpleText != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); @@ -274,6 +274,7 @@ _TokenEditPresenter::_TokenEditPresenter(void) , __isEditModeEnabled(true) , __pDescriptionTextVisualElement(null) , __pDescriptionTextTextObject(null) + , __pDescriptionTextFont(null) , __isTokenEditingFinished(false) , __prevScrollValue(0.0f) , __scrollValue(0.0f) @@ -299,7 +300,6 @@ _TokenEditPresenter::_TokenEditPresenter(void) , __isTouchMoveInProgress(false) , __isTitleSliding(false) , __touchPressInfo(Point(-1, -1)) - , __editContentFontSize(0.0f) { } @@ -308,8 +308,6 @@ _TokenEditPresenter::InitializeDescriptionText(void) { result r = E_SUCCESS; float descriptionTextSize = 0.0f; - Font *pFont = null; - float editFontSize = 0.0f; __pDescriptionTextTextObject = new (std::nothrow) TextObject(); SysTryReturnResult(NID_UI_CTRL, __pDescriptionTextTextObject != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); @@ -326,16 +324,13 @@ _TokenEditPresenter::InitializeDescriptionText(void) GET_SHAPE_CONFIG(TOKENEDIT::DESCRIPTION_TEXT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, descriptionTextSize); - pFont = GetFont(); - SysTryCatch(NID_UI_CTRL, pFont != null, , r, "[%s] Propagating.", GetErrorMessage(r)); + __pDescriptionTextFont = new (std::nothrow) Font(); + SysTryCatch(NID_UI_CTRL, __pDescriptionTextFont != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); - editFontSize = GetTextSize(); - (_FontImpl::GetInstance(*pFont))->SetSize(descriptionTextSize); - - r = __pDescriptionTextTextObject->SetFont(pFont, 0, __pDescriptionTextTextObject->GetTextLength()); + r = __pDescriptionTextFont->Construct(GetTitleFontFaceName(), FONT_STYLE_PLAIN, descriptionTextSize); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + r = __pDescriptionTextTextObject->SetFont(__pDescriptionTextFont, 0, __pDescriptionTextTextObject->GetTextLength()); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - - (_FontImpl::GetInstance(*pFont))->SetSize(editFontSize); return r; @@ -344,6 +339,9 @@ CATCH: delete __pDescriptionTextTextObject; __pDescriptionTextTextObject = null; + delete __pDescriptionTextFont; + __pDescriptionTextFont = null; + return r; } @@ -396,6 +394,12 @@ _TokenEditPresenter::DisposeTokenEditPresenter(void) delete __pDescriptionTextTextObject; __pDescriptionTextTextObject = null; + if (__pDescriptionTextFont) + { + delete __pDescriptionTextFont; + __pDescriptionTextFont = null; + } + if (__pTimingFunction) { delete __pTimingFunction; @@ -470,9 +474,16 @@ _TokenEditPresenter::Initialize(const _Control& control) float textSize = 0.0f; GET_SHAPE_CONFIG(TOKENEDIT::TEXT_SIZE, orientation, textSize); - __editContentFontSize = textSize; + Font* pFont = new (std::nothrow) Font(); + SysTryCatch(NID_UI_CTRL, pFont != null, , r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); + + r = pFont->Construct(FONT_STYLE_PLAIN, textSize); + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + + SetFont(*pFont); - _EditPresenter::SetTextSize(__editContentFontSize); + delete pFont; + pFont = null; __pTokenList = new (std::nothrow) Collection::LinkedList(); SysTryCatch(NID_UI_CTRL, __pTokenList != null, , r = E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); @@ -499,6 +510,9 @@ CATCH: delete pTokenEditModel; pTokenEditModel = null; + delete pFont; + pFont = null; + delete __pTokenBgBitmap; __pTokenBgBitmap = null; @@ -528,9 +542,9 @@ _TokenEditPresenter::DrawText(void) pTokenCanvas->Clear(); Color selectedTokenColor = GetTokenEditColor(EXPANDABLE_EDIT_AREA_TOKEN_STATUS_SELECTED); - Bitmap* pReplacementColorBackgroundBitmap = null; if (__pTokenBgBitmap) { + Bitmap* pReplacementColorBackgroundBitmap = null; pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pTokenBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), selectedTokenColor); if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pReplacementColorBackgroundBitmap)) @@ -552,8 +566,6 @@ _TokenEditPresenter::DrawText(void) delete pTokenCanvas; pTokenCanvas = null; - - delete pReplacementColorBackgroundBitmap; } } else @@ -570,9 +582,6 @@ _TokenEditPresenter::DrawText(void) SysTryReturnVoidResult(NID_UI_CTRL, pCanvas, E_SYSTEM, "[E_SYSTEM] A system error has occurred. Failed to get visual element of Control."); _EditPresenter::DrawText(*pCanvas); - - delete pCanvas; - pCanvas = null; } } } @@ -633,6 +642,7 @@ _TokenEditPresenter::Draw(Canvas& canvas) } else { + //DrawText(canvas); DrawText(); InitializeCursor(); } @@ -641,16 +651,17 @@ _TokenEditPresenter::Draw(Canvas& canvas) { SysTryReturnResult(NID_UI_CTRL, !__isEditingToken, E_SYSTEM, "An invalid argument is given."); + //DrawText(canvas); DrawText(); InitializeCursor(); } if (__isTokenEditingFinished) { + _EditPresenter::SetDefaultFont(); + __isEditingToken = false; __edittingTokenIndex = -1; - _EditPresenter::SetTextSize(__editContentFontSize); - __isTokenEditingFinished = false; } @@ -957,6 +968,11 @@ _TokenEditPresenter::InsertTokenAt(int index, const String& token, bool isUser) r = __pTokenList->InsertAt(*pToken, index); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Failed to insert token.", GetErrorMessage(r)); + if (__isEditingToken) + { + _EditPresenter::SetFont(*(pToken->pFont)); + } + r = ClearText(); r = CalculateTokenPositionFromIndex(index); @@ -1077,7 +1093,7 @@ _TokenEditPresenter::RemoveTokenAt(int index, bool isClearText) r = ClearText(); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, "Failed to clear text object."); - _EditPresenter::SetTextSize(__editContentFontSize); + _EditPresenter::SetDefaultFont(); } r = __pTokenList->RemoveAt(index, true); @@ -1592,7 +1608,7 @@ _TokenEditPresenter::CalculateDescriptionTextRect(const String& descriptionText) SysAssertf(__pDescriptionTextTextObject != null, "The TextObject instance is null."); - __pDescriptionTextTextObject->RemoveAll(true); + __pDescriptionTextTextObject->RemoveAll(); pSimpleText = new (std::nothrow)TextSimple(pTempString, length, TEXT_ELEMENT_SOURCE_TYPE_INTERNAL); __pDescriptionTextTextObject->AppendElement(*pSimpleText); @@ -1655,17 +1671,20 @@ _TokenEditPresenter::DrawDescriptionText(void) float descriptionTextSize = 0.0f; GET_SHAPE_CONFIG(TOKENEDIT::DESCRIPTION_TEXT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, descriptionTextSize); - pDescriptionFont = GetFont(); - if (pDescriptionFont) - { - float editFontSize = GetTextSize(); - (_FontImpl::GetInstance(*pDescriptionFont))->SetSize(descriptionTextSize); + pDescriptionFont = new (std::nothrow) Font(); + SysTryReturn(NID_UI_CTRL, pDescriptionFont != null, false, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed."); - r = __pDescriptionTextTextObject->SetFont(pDescriptionFont, 0, __pDescriptionTextTextObject->GetTextLength()); - SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] A system error has occurred. SetFont failed"); + r = pDescriptionFont->Construct(GetTitleFontFaceName(), FONT_STYLE_PLAIN, descriptionTextSize); - (_FontImpl::GetInstance(*pDescriptionFont))->SetSize(editFontSize); - } + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + r = __pDescriptionTextTextObject->SetFont(pDescriptionFont, 0, __pDescriptionTextTextObject->GetTextLength()); + + SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); + + delete __pDescriptionTextFont; + __pDescriptionTextFont = null; + + __pDescriptionTextFont = pDescriptionFont; } pRootElement = __pTokenEdit->GetVisualElement(); @@ -1746,10 +1765,15 @@ _TokenEditPresenter::DrawDescriptionText(void) __pDescriptionTextTextObject->Draw(*_CanvasImpl::GetInstance(*pDescriptionTextCanvas)); delete pDescriptionTextCanvas; - return true; - CATCH: + if (pDescriptionFont == __pDescriptionTextFont) + { + __pDescriptionTextFont = null; + } + + delete pDescriptionFont; + if (__pDescriptionTextVisualElement != null) { __pDescriptionTextVisualElement->Destroy(); @@ -1834,13 +1858,11 @@ _TokenEditPresenter::SetEditingTokenTextBounds(int index, bool isSetText) float tokenHeight = 0.0f; float tokenVerticalSpacing = 0.0f; float tokenTextLeftMargin = 0.0f; - float tokenFontSize = 0.0f; _ControlOrientation orientation = __pTokenEdit->GetOrientation(); GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_HEIGHT, orientation, tokenHeight); GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_VERTICAL_SPACING, orientation, tokenVerticalSpacing); GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_TEXT_LEFT_MARGIN, orientation, tokenTextLeftMargin); - GET_SHAPE_CONFIG(TOKENEDIT::TOKEN_TEXT_SIZE, orientation, tokenFontSize); _Token* pToken = static_cast <_Token*>(__pTokenList->GetAt(index)); SysTryReturnResult(NID_UI_CTRL, pToken != null, E_SYSTEM, "A system error has occurred. The _Token instance is null"); @@ -1857,11 +1879,9 @@ _TokenEditPresenter::SetEditingTokenTextBounds(int index, bool isSetText) { SetText(pToken->GetText()); } - pToken->pTextObject->RemoveAll(true); + pToken->pTextObject->RemoveAll(); } - - __editContentFontSize = GetTextSize(); - _EditPresenter::SetTextSize(tokenFontSize); + _EditPresenter::SetFont(*(pToken->pFont)); SetTextBounds(tempTextDspRect); @@ -2172,7 +2192,7 @@ _TokenEditPresenter::ProcessTokeningByTouchEvent(const _Control& source, const _ __isEditingToken = false; __edittingTokenIndex = -1; - _EditPresenter::SetTextSize(__editContentFontSize); + _EditPresenter::SetDefaultFont(); __isTokenEditingFinished = false; ClearText(); @@ -2642,38 +2662,6 @@ _TokenEditPresenter::SetFlexBounds(const FloatRectangle& bounds) return _EditPresenter::SetFlexBounds(bounds); } -result -_TokenEditPresenter::SetTextSize(const int size) -{ - result r = E_SUCCESS; - if (__isEditingToken) - { - __editContentFontSize = size; - } - else - { - r = _EditPresenter::SetTextSize(size); - } - - return r; -} - -result -_TokenEditPresenter::SetTextSize(const float size) -{ - result r = E_SUCCESS; - if (__isEditingToken) - { - __editContentFontSize = size; - } - else - { - r = _EditPresenter::SetTextSize(size); - } - - return r; -} - bool _TokenEditPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo) { @@ -2985,7 +2973,7 @@ _TokenEditPresenter::OnSurroundingTextDeleted(int offset, int charCount) __pressedTokenIndex = -1; __edittingTokenIndex = -1; __isEditingToken = false; - _EditPresenter::SetTextSize(__editContentFontSize); + _EditPresenter::SetDefaultFont(); __isTokenEditingFinished = false; AdjustFlexibleHeight(); diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index 6a06bd3..61d3863 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -2265,7 +2265,7 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire) if (itemIndex != -1 && itemIndex == currentSelectedItemIndex && __pItems.at(itemIndex) != null) // same item selected { - if (!IsInitialDraw() && fire) + if (!IsInitialDraw()) { PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP); } @@ -2290,7 +2290,7 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire) if (__pItems.at(itemIndex) != null) { - if (!IsInitialDraw() && fire) + if (!IsInitialDraw()) { PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP); } @@ -2474,7 +2474,7 @@ _Toolbar::AdjustToolbarBounds(void) dimension = pParent->TranslateSize(dimension); bounds.height = dimension.height; - if (__transparent || !IsVisible()) + if (__transparent) { bounds.y -= bounds.height; } @@ -4769,15 +4769,6 @@ _Toolbar::RearrangeButtonItems(void) blockWidth[0] = minItemLength; } - tabLeftMargin = footerLeftMargin; - itemButtonLeftGap = footerLeftMargin; - __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2); - - if (blockWidth[0] > __itemArea.width) - { - blockWidth[0] = __itemArea.width; - } - if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip { __pItems.at(0)->SetBounds(FloatRectangle((GetSizeF().width - blockWidth[0]) / 2, sipFooterItemTopMargin, blockWidth[0], itemHeight)); @@ -4855,20 +4846,6 @@ _Toolbar::RearrangeButtonItems(void) blockWidth[1] = minItemLength; } - tabLeftMargin = footerLeftMargin; - itemButtonLeftGap = footerLeftMargin; - __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2); - - if (blockWidth[0] > (__itemArea.width - itemGap * 2) / 2) - { - blockWidth[0] = (__itemArea.width - itemGap * 2) / 2; - } - - if (blockWidth[1] > (__itemArea.width - itemGap * 2) / 2) - { - blockWidth[1] = (__itemArea.width - itemGap * 2) / 2; - } - if (__header == true && __style == TOOLBAR_TEXT && GetOrientation() == _CONTROL_ORIENTATION_PORTRAIT) // sip { __pItems.at(0)->SetBounds(FloatRectangle(GetSizeF().width / 2 - itemGap - blockWidth[0], sipFooterItemTopMargin, blockWidth[0], itemHeight)); diff --git a/src/ui/inc/FUiCtrl_DateTimeBar.h b/src/ui/inc/FUiCtrl_DateTimeBar.h index cccaa3b..67f460c 100644 --- a/src/ui/inc/FUiCtrl_DateTimeBar.h +++ b/src/ui/inc/FUiCtrl_DateTimeBar.h @@ -82,6 +82,7 @@ public: result FireActionEvent(int actionId); result FireDateTimeChangeEvent(_DateTimeChangeStatus status); + virtual bool IsActivatedOnOpen(void) const; virtual void OnDraw(void); virtual bool OnTouchPressed(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo); virtual bool OnTouchReleased(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo); @@ -90,8 +91,6 @@ public: virtual void OnTouchMoveHandled(const Tizen::Ui::_Control& control); virtual result OnAttachedToMainTree(void); virtual result OnDetachingFromMainTree(void); - virtual void OnActivated(void); - virtual void OnDeactivated(void); virtual bool OnFlickGestureDetected(_TouchFlickGestureDetector& gesture); virtual bool OnFlickGestureCanceled(_TouchFlickGestureDetector& gesture); void AddAccessibilityElement(const Tizen::Graphics::FloatRectangle& itemBounds, const Tizen::Base::String& itemText); @@ -101,7 +100,6 @@ public: void SetFont(Tizen::Graphics::Font& pFont); void SetParentWindowBounds(Tizen::Graphics::FloatRectangle& parentWindowBounds); Tizen::Graphics::FloatRectangle GetParentWindowBounds() const; - void RefreshItems(void); // accessibility listener virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h b/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h index c72e912..38d442f 100644 --- a/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h +++ b/src/ui/inc/FUiCtrl_DateTimeBarPresenter.h @@ -83,7 +83,7 @@ public: virtual bool OnFlickGestureDetected(int distanceX,int distanceY,int duration); void StartFlickAnimation(void); void StartAnimationEffect(void); - void SetInitialAnimationValue(float animationValue); + void SetInitialAnimationValue(int animationValue); void SetFont(Tizen::Graphics::Font& pFont); virtual bool OnAccessibilityFocusMovedNext(const _AccessibilityContainer& control, const _AccessibilityElement& element); diff --git a/src/ui/inc/FUiCtrl_Edit.h b/src/ui/inc/FUiCtrl_Edit.h index 2fb97d0..aa8e947 100644 --- a/src/ui/inc/FUiCtrl_Edit.h +++ b/src/ui/inc/FUiCtrl_Edit.h @@ -397,6 +397,8 @@ public: result DeleteCharacterAt(int index); result DeleteCharacterAtCursorPosition(void); void SetCursorDisabled(bool disabled); + void SetPressedGuideTextColor(const Tizen::Graphics::Color& color); + Tizen::Graphics::Color GetPressedGuideTextColor(void) const; result HideKeypad(void); void InitializeColorInformation(void); void SetViewModeColorInformation(bool enabled); diff --git a/src/ui/inc/FUiCtrl_EditPresenter.h b/src/ui/inc/FUiCtrl_EditPresenter.h index ae22665..35de054 100644 --- a/src/ui/inc/FUiCtrl_EditPresenter.h +++ b/src/ui/inc/FUiCtrl_EditPresenter.h @@ -167,8 +167,8 @@ public: result SetEllipsisPosition(EllipsisPosition position); virtual result SetFlexBounds(const Tizen::Graphics::Rectangle& bounds); virtual result SetFlexBounds(const Tizen::Graphics::FloatRectangle& bounds); - virtual result SetTextSize(const int size); - virtual result SetTextSize(const float size); + result SetTextSize(const int size); + result SetTextSize(const float size); result SetFont(const Tizen::Graphics::Font& font); result AdjustFont(Tizen::Graphics::Font& font, _EditFontChange fontChange = EDIT_FONT_CHANGE_CONTENT); result SetFontType(const Tizen::Base::String& typefaceName, unsigned long styleMask); @@ -305,6 +305,7 @@ public: bool GetCursorChangedFlag(void) const; void SetAutoShrinkModeEnabled(bool enable); bool IsAutoShrinkModeEnabled(void) const; + result SetDefaultFont(void); void SetEditGroupStyle(GroupStyle groupStyle); void ScrollPanelToCursorPosition(bool show = true); void SetSearchBarFlag(bool enabled); diff --git a/src/ui/inc/FUiCtrl_Form.h b/src/ui/inc/FUiCtrl_Form.h index 31559c9..a64d9ad 100644 --- a/src/ui/inc/FUiCtrl_Form.h +++ b/src/ui/inc/FUiCtrl_Form.h @@ -202,6 +202,8 @@ public: // Focus UI Tizen::Base::Collection::IListT<_Control*>* GetFocusList(void) const; + void MakeFocusList(const _Control* pControl, Tizen::Base::Collection::IListT<_Control*>* pFocusControlList) const; + void MakeChildContainerFocusList(_Control* pControl, int startIndex) const; // Accessor protected: diff --git a/src/ui/inc/FUiCtrl_Popup.h b/src/ui/inc/FUiCtrl_Popup.h index 458219d..27d8c51 100644 --- a/src/ui/inc/FUiCtrl_Popup.h +++ b/src/ui/inc/FUiCtrl_Popup.h @@ -108,7 +108,6 @@ public: virtual result OnBoundsChanging(const Tizen::Graphics::Rectangle& bounds); virtual bool IsLayoutChangable(void) const; virtual void OnOwnerChanged(_Control* pOldOwner); - virtual void UpdateClientBounds(const Tizen::Graphics::FloatDimension& size, Tizen::Graphics::FloatRectangle& clientBounds); // Accessor public: diff --git a/src/ui/inc/FUiCtrl_SearchBar.h b/src/ui/inc/FUiCtrl_SearchBar.h index 750fcf9..c50cc81 100644 --- a/src/ui/inc/FUiCtrl_SearchBar.h +++ b/src/ui/inc/FUiCtrl_SearchBar.h @@ -291,7 +291,6 @@ private: bool __isUsableCancelButton; bool __isUserContainerBounds; bool __isCancelActionInProgress; - bool __isUserGuideTextColor; CoreKeypadAction __keypadAction; diff --git a/src/ui/inc/FUiCtrl_SlidableGroupedListImpl.h b/src/ui/inc/FUiCtrl_SlidableGroupedListImpl.h index 76f4261..0064a6f 100644 --- a/src/ui/inc/FUiCtrl_SlidableGroupedListImpl.h +++ b/src/ui/inc/FUiCtrl_SlidableGroupedListImpl.h @@ -277,7 +277,6 @@ private: int __bottomGroup; int __topGroup; int __loadedCount; - bool __isFullUpdate; _SlidableGroupedListItemProvider* __pItemProvider; Tizen::Base::Collection::LinkedList __slidableListenersList; Tizen::Base::Collection::LinkedList __itemListenersList; diff --git a/src/ui/inc/FUiCtrl_SliderPresenter.h b/src/ui/inc/FUiCtrl_SliderPresenter.h index 6cc815b..6318b91 100644 --- a/src/ui/inc/FUiCtrl_SliderPresenter.h +++ b/src/ui/inc/FUiCtrl_SliderPresenter.h @@ -38,7 +38,6 @@ class _SliderOverlay; class _SliderPresenter : public Tizen::Base::Object - , public Tizen::Base::Runtime::ITimerEventListener { public: virtual ~_SliderPresenter(void); @@ -70,10 +69,8 @@ public: result SetThumbBitmap(SliderThumbStatus status, const Tizen::Graphics::Bitmap& bitmap); void SetThumbTextColor(SliderThumbStatus status, const Tizen::Graphics::Color& color); - virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer); - private: - int CalculateSliderValue(float positionX, float offsetX); + int CalculateSliderValue(int positionX, int offsetX); result Resize(void); result LoadBitmap(void); result DrawSlider(void); @@ -103,8 +100,6 @@ private: Tizen::Graphics::FloatRectangle __barRect; Tizen::Graphics::FloatRectangle __handleRect; - Tizen::Base::Runtime::Timer* __pSlideTimer; - Tizen::Graphics::Bitmap* __pResourceBgTopBitmap; Tizen::Graphics::Bitmap* __pResourceBgMiddleBitmap; Tizen::Graphics::Bitmap* __pResourceBgBottomBitmap; @@ -157,17 +152,13 @@ private: bool __isSliderPressed; bool __isNeedToBeUpdated; + bool __isBubblingBlocked; bool __isResourceLoaded; bool __isCustomHandle; bool __isCustomPressedTextColor; GroupStyle __groupStyle; float __fontSize; float __barOffset; - - bool __isTimerRunning; - - Tizen::Graphics::FloatPoint __currentPosition; - static const int __timerValue = 5; }; // _SliderPresenter }}} // Tizen::Ui::Controls diff --git a/src/ui/inc/FUiCtrl_SplitPanel.h b/src/ui/inc/FUiCtrl_SplitPanel.h index f42eac2..41d3135 100644 --- a/src/ui/inc/FUiCtrl_SplitPanel.h +++ b/src/ui/inc/FUiCtrl_SplitPanel.h @@ -105,13 +105,13 @@ public: virtual bool OnAccessibilityValueIncreased(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); virtual bool OnAccessibilityValueDecreased(const Tizen::Ui::_AccessibilityContainer& control, const Tizen::Ui::_AccessibilityElement& element); + public: result AddSplitPanelEventListener(const _ISplitPanelEventListener& listener); result RemoveSplitPanelEventListener(const _ISplitPanelEventListener& listener); result SetPane(_Control* pControl, SplitPanelPaneOrder paneOrder); _Control* GetPane(SplitPanelPaneOrder paneOrder) const; - _Control* GetPaneParent(SplitPanelPaneOrder paneOrder) const; result SetDividerStyle(SplitPanelDividerStyle splitPanelDividerStyle); SplitPanelDividerStyle GetDividerStyle(void) const; @@ -153,14 +153,10 @@ private: _SplitPanel& operator =(const _SplitPanel& rhs); private: - static const float ACCESSIBILITY_DIVIDER_POSITION_OFFSET = 5.0f; - _SplitPanelPresenter* __pSplitPanelPresenter; _TouchTapGestureDetector* __pTapGesture; - Tizen::Ui::_Control* __pFirstPaneParent; - Tizen::Ui::_Control* __pSecondPaneParent; Tizen::Ui::_Control* __pFirstPane; Tizen::Ui::_Control* __pSecondPane; diff --git a/src/ui/inc/FUiCtrl_SplitPanelPresenter.h b/src/ui/inc/FUiCtrl_SplitPanelPresenter.h index 8b4ea6b..d6fb447 100644 --- a/src/ui/inc/FUiCtrl_SplitPanelPresenter.h +++ b/src/ui/inc/FUiCtrl_SplitPanelPresenter.h @@ -101,11 +101,9 @@ private: void ChangePaneOrder(SplitPanelPaneOrder paneOrder); result AnimateDivider(int destination); result AnimatePane(int destination); - result AnimatePaneParent(int destination); Tizen::Ui::Control* GetPaneControl(SplitPanelPaneOrder paneOrder); - Tizen::Ui::Animations::AnimationTransactionStatus GetTransactionStatus(void); + Tizen::Ui::Animations::AnimatorStatus GetAnimationStatus(void); Tizen::Graphics::FloatRectangle GetRestorePaneBounds(SplitPanelPaneOrder paneOrder); - Tizen::Ui::Animations::VisualElementPropertyAnimation* GetVisualElementAnimation(Tizen::Base::String propertyName); private: _SplitPanelPresenter(const _SplitPanelPresenter& value); @@ -133,8 +131,8 @@ private: int __transactionIdMaximize; int __transactionIdRestore; - Tizen::Ui::Animations::AnimationInterpolatorType __controlAnimatorInterpolator; - Tizen::Base::String __visualElementInterpolator; + Tizen::Ui::Animations::AnimationInterpolatorType __controlAnimatorAnimationInterpolator; + Tizen::Base::String __visualElementAnimationInterpolator; }; // _SplitPanelPresenter; diff --git a/src/ui/inc/FUiCtrl_TableViewItem.h b/src/ui/inc/FUiCtrl_TableViewItem.h index 557459b..a4830ca 100644 --- a/src/ui/inc/FUiCtrl_TableViewItem.h +++ b/src/ui/inc/FUiCtrl_TableViewItem.h @@ -299,7 +299,6 @@ protected: result StartTouchPressedTimer(const _Control& source, const _TouchInfo& touchinfo); void StopTouchPressedTimer(void); result StartTouchReleasedTimer(void); - void StopTouchReleasedTimer(void); private: _TableViewItem(const _TableViewItem&); @@ -336,8 +335,7 @@ private: result CreateItemCover(void); result CreateItemDivider(void); result CreateItemAnnexDivider(void); - void FireItemTouchReleased(void); - void FireItemTouchPressed(void); + void FireItemTouchRelease(void); private: void* __pAppInfo; @@ -408,7 +406,6 @@ private: bool __isPressedTimerEnabled; bool __isReleasedTimerEnabled; TableViewItemPressedControl __pressedControl; - TableViewItemPressedControl __releasedControl; Tizen::Base::Runtime::Timer* __pCheckedTimer; bool __isCheckedTimerEnabled; @@ -438,7 +435,7 @@ private: static const int DEFAULT_CAPTURED_CONTROL_COUNT = 10; static const int CHECKED_ANIMATION_DURATION = 30; static const int TOUCH_PRESSED_DURATION = 100; - static const int TOUCH_RELEASED_DURATION = 50; + static const int TOUCH_RELREASED_DURATION = 50; static const int MAX_CHECKED_COUNT = 10; static const float INSENSITIVE = 0.16f; static const float SENSITIVE = 0.08f; diff --git a/src/ui/inc/FUiCtrl_TokenEditPresenter.h b/src/ui/inc/FUiCtrl_TokenEditPresenter.h index c1f675a..3a30fd8 100644 --- a/src/ui/inc/FUiCtrl_TokenEditPresenter.h +++ b/src/ui/inc/FUiCtrl_TokenEditPresenter.h @@ -132,8 +132,6 @@ public: virtual bool OnFocusLost(void); virtual result SetFlexBounds(const Tizen::Graphics::FloatRectangle& bounds); - virtual result SetTextSize(const int size); - virtual result SetTextSize(const float size); // Touch callbacks virtual bool OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo); @@ -205,6 +203,8 @@ private: Tizen::Graphics::FloatRectangle __descriptionTextRect; + Tizen::Graphics::Font* __pDescriptionTextFont; + bool __isTokenEditingFinished; float __prevScrollValue; @@ -255,8 +255,6 @@ private: Tizen::Graphics::Point __touchPressInfo; - int __editContentFontSize; - }; // _TokenEditPresenter diff --git a/src/ui/inc/FUi_ContainerImpl.h b/src/ui/inc/FUi_ContainerImpl.h index 28d04dc..fb82ca1 100644 --- a/src/ui/inc/FUi_ContainerImpl.h +++ b/src/ui/inc/FUi_ContainerImpl.h @@ -53,7 +53,6 @@ public: result AddChild(_ControlImpl* pChild, bool transferOwnership = true); result RemoveChild(_ControlImpl* pChild, bool deallocate = true); result RemoveChild(int index); - void DeleteAllChildren(_ContainerImpl* pChild, bool detachSystemChild = true); void RemoveAllChildren(bool detachSystemChild = true); result MoveChildToTop(const _ControlImpl& child); result MoveChildBefore(const _ControlImpl& targetChild, const _ControlImpl& child); diff --git a/src/ui/inc/FUi_Control.h b/src/ui/inc/FUi_Control.h index 87d5638..92c7818 100644 --- a/src/ui/inc/FUi_Control.h +++ b/src/ui/inc/FUi_Control.h @@ -397,12 +397,11 @@ public: void SetNativeObjectFocusable(bool focusable); // Focus UI - void SetPreviousFocus(_Control* pPreviousFocus); - void SetNextFocus(_Control* pNextFocus); - _Control* GetPreviousFocus() const; - _Control* GetNextFocus() const; - void DrawFocus(void); - Tizen::Base::Collection::IListT<_Control*>* GetFocusListN(void) const; + void SetPreviousFocus(_Control* pPreviousFocus); + void SetNextFocus(_Control* pNextFocus); + _Control* GetPreviousFocus() const; + _Control* GetNextFocus() const; + void DrawFocus(void); // Clipping bool IsClipToParent(void) const; @@ -586,10 +585,6 @@ private: void SetEventListener(_IntToType<_UI_EVENT_FOCUS>, _IFocusEventListener* pListener); void SetEventListener(_IntToType<_UI_EVENT_NOTIFICAITON>, _INotificationEventListener* pListener); -// Focus Ui - void MakeFocusList(const _Control* pControl, Tizen::Base::Collection::IListT<_Control*>* pFocusControlList) const; - void MakeChildContainerFocusList(const _Control* pControl, int startIndex, Tizen::Base::Collection::IListT<_Control*>* pFocusControlList) const; - private: _ControlHandle __controlHandle; Tizen::Base::String __name; diff --git a/src/ui/layout/FUi_LayoutLayoutContainer.cpp b/src/ui/layout/FUi_LayoutLayoutContainer.cpp old mode 100755 new mode 100644 index 67f6aa5..cca2da2 --- a/src/ui/layout/FUi_LayoutLayoutContainer.cpp +++ b/src/ui/layout/FUi_LayoutLayoutContainer.cpp @@ -261,10 +261,15 @@ LayoutContainer::Measure(float width, float height) if (__pCurrentLayout != null) { - LayoutRect containerClientRect = {0.0f, 0.0f, measuredWidth, measuredHeight}; - ConvertWindowToClientBounds(containerClientRect, containerClientRect); + LayoutRect calculatedRect; + GetItemWindowRect(calculatedRect); + calculatedRect.w = measuredWidth; + calculatedRect.h = measuredHeight; + SetItemWindowRect(calculatedRect); - LayoutSize containerSize = {containerClientRect.w, containerClientRect.h}; + ConvertWindowToClientBounds(calculatedRect, calculatedRect); + + LayoutSize containerSize = {calculatedRect.w, calculatedRect.h}; SetIntendedWindowSize(containerSize); __pCurrentLayout->OnLayout(measuredWidth, measuredHeight, true); diff --git a/src/ui/layout/FUi_LayoutLayoutItem.cpp b/src/ui/layout/FUi_LayoutLayoutItem.cpp old mode 100755 new mode 100644 index 364eac0..76e0b19 --- a/src/ui/layout/FUi_LayoutLayoutItem.cpp +++ b/src/ui/layout/FUi_LayoutLayoutItem.cpp @@ -146,21 +146,18 @@ LayoutItem::Measure(float width, float height) float wrapContentWidth = 0.0f; float wrapContentHeight = 0.0f; - if (widthMode == WRAP_CONTENT || heightMode == WRAP_CONTENT) + Tizen::Graphics::FloatDimension size = __pOuterControl->GetItemContentSize(); + + if (size.width > 0 || size.height > 0) { - Tizen::Graphics::FloatDimension size = __pOuterControl->GetItemContentSize(); - if (size.width > 0.0f || size.height > 0.0f) - { - __contentSizeState = true; - wrapContentWidth = size.width; - wrapContentHeight = size.height; - } - else - { - __contentSizeState = false; - wrapContentWidth = width; - wrapContentHeight = height; - } + __contentSizeState = true; + wrapContentWidth = size.width; + wrapContentHeight = size.height; + } + else + { + wrapContentWidth = width; + wrapContentHeight = height; } if (widthMode == NONE_MODE) diff --git a/src/ui/layout/FUi_LayoutLayoutItemProxy.cpp b/src/ui/layout/FUi_LayoutLayoutItemProxy.cpp old mode 100755 new mode 100644 index 0af779d..a6924dc --- a/src/ui/layout/FUi_LayoutLayoutItemProxy.cpp +++ b/src/ui/layout/FUi_LayoutLayoutItemProxy.cpp @@ -23,7 +23,6 @@ #include #include -#include "FUi_Math.h" #include "FUi_LayoutLayoutItemProxy.h" #include "FUi_LayoutLayoutContainer.h" @@ -175,7 +174,7 @@ void LayoutItemProxy::GetItemWindowRect(LayoutRect& itemRect) const { SysAssertf(__pItem != null, "LayoutItem is invalid"); - if (_FloatCompare(__calculatedRect.x, 0.0f) && _FloatCompare(__calculatedRect.y, 0.0f) && _FloatCompare(__calculatedRect.w, 0.0f) && _FloatCompare(__calculatedRect.h, 0.0f)) + if (__calculatedRect.x == 0 && __calculatedRect.y == 0 && __calculatedRect.w == 0 && __calculatedRect.h == 0) { __pItem->GetItemWindowRect(itemRect); } diff --git a/src/ui/resource/FUi_ResourceFocusUiConfig.cpp b/src/ui/resource/FUi_ResourceFocusUiConfig.cpp deleted file mode 100644 index aa6cccf..0000000 --- a/src/ui/resource/FUi_ResourceFocusUiConfig.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// -// Open Service Platform -// Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#include "FUi_ResourceConfigMacro.h" - -START_UI_CONFIG(FOCUSUI); -{ - ADD_IMAGE_CONFIG(FOCUS,#00_focus.#.png); -} -END_UI_CONFIG(FOCUSUI); - diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp index 4566517..dd88888 100644 --- a/src/ui/resource/FUi_ResourceFooterConfig.cpp +++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp @@ -272,7 +272,7 @@ START_UI_CONFIG(FOOTER); ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 48); ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 40); ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, 28); - ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, 8); + ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, 10); ADD_SHAPE_CONFIG(FOOTER_ITEM_TEXT_TOP_MARGIN, 0); ADD_SHAPE_CONFIG(ITEM_MINIMUM_WIDTH, 60); ADD_SHAPE_CONFIG(COMMON_MINIMUM_MARGIN, 8); diff --git a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp index 40c833e..da2cbac 100644 --- a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp +++ b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp @@ -37,10 +37,7 @@ START_UI_CONFIG(SEARCHBAR); ADD_COLOR_CONFIG(EDIT_BG_DISABLED, $W031D); ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $W032); ADD_COLOR_CONFIG(GUIDE_TEXT_DISABLED, $W032D); - ADD_COLOR_CONFIG(GUIDE_TEXT_HIGHLIGHTED, $W032); - ADD_COLOR_CONFIG(EDIT_TEXT_NORMAL, $W032P); - ADD_COLOR_CONFIG(EDIT_TEXT_DISABLED, $W032D); - ADD_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, $W032P); + ADD_COLOR_CONFIG(GUIDE_TEXT_HIGHLIGHTED, $W032P); ADD_COLOR_CONFIG(ICON_BG_NORMAL, $F041i); ADD_COLOR_CONFIG(ICON_BG_DISABLED, $F041iD); ADD_COLOR_CONFIG(CONTENT_AREA_BG_NORMAL, $B013); -- 2.7.4