From 774602c43b0aa24698f232dc2c6396c106c2adb0 Mon Sep 17 00:00:00 2001 From: kishorekumar Dachinamoorthy Date: Thu, 4 Jul 2013 11:42:01 +0530 Subject: [PATCH] Fixing overlay position and memory leaks in slider. Change-Id: I7259255c894b0b6df7c8dce1e62b3aac71e3e8c5 --- src/ui/controls/FUiCtrl_SliderOverlay.cpp | 6 ------ src/ui/controls/FUiCtrl_SliderPresenter.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui/controls/FUiCtrl_SliderOverlay.cpp b/src/ui/controls/FUiCtrl_SliderOverlay.cpp index edb61f3..4e3ade5 100644 --- a/src/ui/controls/FUiCtrl_SliderOverlay.cpp +++ b/src/ui/controls/FUiCtrl_SliderOverlay.cpp @@ -198,12 +198,6 @@ _SliderOverlay::DrawSliderOverlay(int positionX, int handleWidth, int value) __sliderRect.y + overlayY - (overlayHeight + overlayBottomMargin), overlayWidth, overlayHeight); - // Check SliderOverlay Position - if (__sliderOverlayRect.x < __sliderRect.x) - { - __sliderOverlayRect.x = __sliderRect.x; - } - SetBounds(__sliderOverlayRect); // Get canvas & Clear BG diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp index aceb42e..8b89d16 100644 --- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp @@ -1528,6 +1528,9 @@ _SliderPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& touc point.x = pCanvas->GetBoundsF().x + pCanvas->GetBoundsF().width; } + delete pCanvas; + pCanvas = null; + if (__isSliderPressed == true) { PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pSlider); @@ -1619,6 +1622,9 @@ _SliderPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchin __pSlideTimer->Start(__timerValue); } + delete pCanvas; + pCanvas = null; + return true; } -- 2.7.4