Fixed Jira issue N_SE-44828, N_SE-45077, N_SE-45140

Change-Id: I318df735daa91e62d6155074cbc88bc2c3f178aa
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_Slider.cpp b/src/ui/controls/FUiCtrl_Slider.cpp
index 90e842b..45c39ce 100644 (file)
--- a/src/ui/controls/FUiCtrl_Slider.cpp
+++ b/src/ui/controls/FUiCtrl_Slider.cpp
@@ -415,7 +415,9 @@ _Slider::OnKeyReleased(const _Control &source, const _KeyInfo &keyInfo)
                        pSliderOverlay->Close();
                }
 
+               FireAdjustmentValueEvent(GetValue());
                __isKeyPressed = false;
+
                Invalidate();
                return true;
        }
@@ -985,6 +987,7 @@ _Slider::OnAccessibilityValueIncreased(const _AccessibilityContainer& control, c
 
        Invalidate();
        FireSliderMoveEvent(GetValue());
+       FireAdjustmentValueEvent(GetValue());
 
        return true;
 }
@@ -1009,6 +1012,7 @@ _Slider::OnAccessibilityValueDecreased(const _AccessibilityContainer& control, c
 
        Invalidate();
        FireSliderMoveEvent(GetValue());
+       FireAdjustmentValueEvent(GetValue());
 
        return true;
 }
@@ -1029,4 +1033,18 @@ _Slider::FireSliderMoveEvent(int value)
        }
 }
 
+void
+_Slider::FireAdjustmentValueEvent(int adjustment)
+{
+       if (__pAdjustmentEvent != null)
+       {
+               IEventArg* pEventArg = _AdjustmentEvent::CreateAdjustmentEventArgN(adjustment);
+               if( pEventArg == null)
+               {
+                       return;
+               }
+
+               __pAdjustmentEvent->Fire(*pEventArg);
+       }
+}
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp
index 8b89d16..4fddb17 100644 (file)
--- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp
@@ -996,6 +996,8 @@ _SliderPresenter::OnChangeLayout(_ControlOrientation orientation)
                __pSlider->Invalidate();
        }
 
+       __isSetValue = true;
+
        _TouchManager* pTouchMgr = _TouchManager::GetInstance();
        if (pTouchMgr)
        {

diff --git a/src/ui/inc/FUiCtrl_Slider.h b/src/ui/inc/FUiCtrl_Slider.h
index 24d9d50..0345aad 100644 (file)
--- a/src/ui/inc/FUiCtrl_Slider.h
+++ b/src/ui/inc/FUiCtrl_Slider.h
@@ -124,6 +124,7 @@ public:
        result SetThumbBitmap(SliderThumbStatus status, const Tizen::Graphics::Bitmap& bitmap);
        void SetThumbTextColor(SliderThumbStatus status, const Tizen::Graphics::Color& color);
        void FireSliderMoveEvent(int value);
+       void FireAdjustmentValueEvent(int adjustment);
        bool IsKeyPressed(void) const;
 
        virtual bool OnTouchPressed(const Tizen::Ui::_Control& source, const Tizen::Ui::_TouchInfo& touchinfo);