camerauis/cameraxui/cxui/src/cxuisettingslider.cpp
changeset 21 fa6d9f75d6a6
parent 19 d9aefe59d544
child 45 24fd82631616
--- a/camerauis/cameraxui/cxui/src/cxuisettingslider.cpp	Fri Apr 16 14:51:30 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuisettingslider.cpp	Mon May 03 12:22:55 2010 +0300
@@ -51,8 +51,8 @@
         // labels correctly if step is something else than 1
         int step = 1;
         mSliderScaleValue = 1;
-        if (data->mStep != 0) {
-            mSliderScaleValue = step / data->mStep;
+        if (data->mMinorStep != 0) {
+            mSliderScaleValue = step / data->mMinorStep;
         }
 
         // scale min and max values as step has been set to 1
@@ -61,17 +61,13 @@
         CX_DEBUG(("Setting slider range [%d..%d]", minvalue, maxvalue));
         setRange(minvalue,maxvalue);
         setSingleStep(step);
-
-        setSnappingMode(HbSlider::MajorTickSnapping);
+         
+        setSnappingMode(HbSlider::MinorTickSnapping);
 
-        // don't show labels and tickmarks if there are no strings to be shown
-        if (!data->mSettingStrings.isEmpty()) {
-            setMajorTickLabels(data->mSettingStrings);
-            setMajorTickInterval(step);
-            setTickPosition(Hb::SliderTicksLeft);
-        } else {
-            setTickPosition(Hb::NoSliderTicks);
-        }
+        setMajorTickLabels(data->mSettingStrings);
+        setMajorTickInterval(mSliderScaleValue * data->mMajorStep);
+        setMinorTickInterval(mSliderScaleValue * data->mMinorStep);
+        setTickPosition(Hb::SliderTicksAbove);
 
         setSettingId(data->mSettingId);