From d670c00fc5a258d1cd25cd22bc0e6d4058394dd6 Mon Sep 17 00:00:00 2001 From: SungHee Kim Date: Tue, 11 Jun 2013 14:06:26 +0900 Subject: [PATCH] Added comparison code between new and old value at setters. Change-Id: Id0a25c6534936ed2d4b14a39091f9db5af1e76b7 Signed-off-by: SungHee Kim --- src/ui/controls/FUiCtrl_FastScrollPresenter.cpp | 23 ++++++++++++++--------- src/ui/controls/FUiCtrl_ScrollPresenter.cpp | 15 ++++++++++----- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp index b81204b..0ae6b49 100644 --- a/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp +++ b/src/ui/controls/FUiCtrl_FastScrollPresenter.cpp @@ -360,6 +360,11 @@ _FastScrollIndexView::FadeOutAndDestroy(void) result _FastScrollIndexView::SetBaseIndex(_FastScrollIndex* pIndex) { + if (__pBaseIndex == pIndex) + { + return E_SUCCESS; + } + __pBaseIndex = pIndex; result r = UpdateIndex(false); @@ -594,15 +599,15 @@ _FastScrollIndexView::SetIndexVisibility(bool visibility) __pBaseIndexVe->SetImplicitAnimationEnabled(true); - if (visibility) - { - __pBaseIndexVe->SetOpacity(FASTSCROLL_OPACITY_ON); - } - else - { - __pBaseIndexVe->SetOpacity(FASTSCROLL_OPACITY_OFF); - } - // else keep up current visibility. + if (visibility) + { + __pBaseIndexVe->SetOpacity(FASTSCROLL_OPACITY_ON); + } + else + { + __pBaseIndexVe->SetOpacity(FASTSCROLL_OPACITY_OFF); + } + // else keep up current visibility. __pBaseIndexVe->SetImplicitAnimationEnabled(false); diff --git a/src/ui/controls/FUiCtrl_ScrollPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPresenter.cpp index 8fc0b34..031a12c 100644 --- a/src/ui/controls/FUiCtrl_ScrollPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ScrollPresenter.cpp @@ -223,10 +223,13 @@ CATCH: result _ScrollPresenter::SetScrollDirection(_ScrollDirection scrollDirection) { - result r = E_SUCCESS; + if (__scrollDirection == scrollDirection) + { + return E_SUCCESS; + } // load color/shape configuration and bitmap resources - r = LoadResources(scrollDirection, _CONTROL_ORIENTATION_PORTRAIT); + result r = LoadResources(scrollDirection, _CONTROL_ORIENTATION_PORTRAIT); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to load resources."); // reset attributes @@ -256,16 +259,18 @@ _ScrollPresenter::SetScrollRange(float viewRange, float scrollRange) { SysTryReturn(NID_UI_CTRL, ((scrollRange >= viewRange) && (scrollRange != 0)), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid arguments"); - result r = E_SUCCESS; + if (__viewRange == viewRange && __scrollRange == scrollRange) + { + return E_SUCCESS; + } __viewRange = viewRange; __scrollRange = scrollRange; - r = RelayoutScrollChildren(__scrollDirection); + result r = RelayoutScrollChildren(__scrollDirection); SysTryReturnResult(NID_UI_CTRL, r == E_SUCCESS, r, "Failed to relayout scroll chilren"); return E_SUCCESS; - } void -- 2.7.4