From 1e363b70b59dafe0900fbcd1ff4f85e15f355a37 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= Date: Thu, 17 Sep 2020 14:18:16 +0200 Subject: [PATCH] [AT-SPI] Let MarkFilter find the closest mark Change-Id: I82c2bf9572a7190010e347ae352136668aae705c --- dali-toolkit/internal/controls/slider/slider-impl.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 5356588..e2dc5e3 100644 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -847,19 +847,9 @@ float Slider::MarkFilter( float value ) { const float MARK_TOLERANCE = GetMarkTolerance(); - float mark; - for( MarkList::SizeType i = 0; i < mMarks.Count(); ++i) - { - const Property::Value& propertyValue = mMarks[i]; - propertyValue.Get( mark ); - mark = MapValuePercentage( mark ); - - // If close to a mark, return the mark - if( fabsf( mark - value ) < MARK_TOLERANCE ) - { - return mark; - } - } + float mark = SnapToMark(value); + if (fabsf(mark - value) < MARK_TOLERANCE) + return mark; return value; } -- 2.7.4