From 76098a992229112954c7715a350856342b7576f9 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 19 Feb 2018 17:40:38 +0900 Subject: [PATCH 1/1] Fix SVACE issues - Initialized some member variables. Change-Id: I4bb73c17bfb1b80f90f5977e8ad140e8882d6746 Signed-off-by: Seoyeon Kim --- dali-toolkit/internal/controls/control/control-data-impl.cpp | 3 +++ dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp | 1 + dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h | 1 - dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index b061268..369c409 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -327,6 +327,9 @@ Control::Impl::Impl( Control& controlImpl ) mMargin( 0, 0, 0, 0 ), mPadding( 0, 0, 0, 0 ), mKeyEventSignal(), + mKeyInputFocusGainedSignal(), + mKeyInputFocusLostSignal(), + mResourceReadySignal(), mPinchGestureDetector(), mPanGestureDetector(), mTapGestureDetector(), diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index 45cf8b7..cd8438e 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -194,6 +194,7 @@ ScrollBar::ScrollBar(Toolkit::ScrollBar::Direction direction) mIndicatorHideDuration(DEFAULT_INDICATOR_HIDE_DURATION), mTransientIndicatorDuration(DEFAULT_INDICATOR_TRANSIENT_DURATION), mScrollStart(0.0f), + mGestureDisplacement( Vector3::ZERO ), mCurrentScrollPosition(0.0f), mIndicatorHeightPolicy(Toolkit::ScrollBar::Variable), mIndicatorFixedHeight(DEFAULT_INDICATOR_FIXED_HEIGHT), diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h index 39f9e53..d95d190 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -316,7 +316,6 @@ private: Constraint mIndicatorPositionConstraint; Constraint mIndicatorSizeConstraint; - Constraint mScrollPositionInCurrentAxisConstraint; bool mIsPanning : 1; ///< Whether the scroll bar is being panned. bool mIndicatorFirstShow : 1; ///< True if the indicator has never been shown diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp index 31201ee..6cd2e67 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp @@ -86,6 +86,9 @@ Scrollable::Scrollable() mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), mOvershootSize( OVERSHOOT_DEFAULT_SIZE ), mScrollToAlphaFunction( AlphaFunction::EASE_OUT ), + mScrollStartedSignal(), + mScrollUpdatedSignal(), + mScrollCompletedSignal(), mOvershootEnabled(true) { } @@ -96,6 +99,9 @@ Scrollable::Scrollable( ControlBehaviour behaviourFlags ) mOvershootAnimationSpeed ( DEFAULT_OVERSHOOT_ANIMATION_SPEED ), mOvershootSize( OVERSHOOT_DEFAULT_SIZE ), mScrollToAlphaFunction( AlphaFunction::EASE_OUT ), + mScrollStartedSignal(), + mScrollUpdatedSignal(), + mScrollCompletedSignal(), mOvershootEnabled(true) { } -- 2.7.4