From 0b1f0635d9244d56643531b36955f120c6279b5f Mon Sep 17 00:00:00 2001 From: Park Kyoung Hee Date: Mon, 29 Apr 2013 15:10:53 +0900 Subject: [PATCH] fix scroll bar load effect on ScrollPanel Change-Id: Ieea241744280df44d8c56a7573eb97a705b3c307 Signed-off-by: Park Kyoung Hee --- src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp index a75377e..48170ff 100644 --- a/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ScrollPanelPresenter.cpp @@ -1737,9 +1737,8 @@ _ScrollPanelPresenter::FadeOutScrollBar(void) _Scroll* pScrollBar = __pScrollPanel->GetScrollBar(); if (pScrollBar != null) { - if (!pScrollBar->IsEnabledHandler() - || !IsScrollable() - || (__pScrollPanel->IsScrollBarVisible() && __scrollBarLoadEffectStatus == _SCROLL_PANEL_SCROLL_BAR_LOAD_EFFECT_LOADED)) + if ((!__pScrollPanel->IsScrollBarVisible() || !IsScrollable()) + || (!pScrollBar->IsEnabledHandler() && __scrollBarLoadEffectStatus == _SCROLL_PANEL_SCROLL_BAR_LOAD_EFFECT_LOADED)) { result r = pScrollBar->SetScrollVisibility(false); SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r)); -- 2.7.4