From f5b98922d42457ef4e33c05dc1fb612fa24e888f Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Thu, 9 Apr 2015 11:51:13 +0100
Subject: [PATCH] Fix for slider labels
Change-Id: I76a87d300299358540216a5424bae9f29316ed75
---
dali-toolkit/internal/controls/slider/slider-impl.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index f635c13..7ab8438 100755
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -528,6 +528,8 @@ Toolkit::TextLabel Slider::CreatePopupText()
Toolkit::TextLabel textLabel = Toolkit::TextLabel::New();
textLabel.SetParentOrigin( ParentOrigin::CENTER );
textLabel.SetAnchorPoint( AnchorPoint::CENTER );
+ textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+ textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
textLabel.SetZ( VALUE_DISPLAY_TEXT_Z );
return textLabel;
}
@@ -539,6 +541,9 @@ ImageActor Slider::CreatePopup()
popup.SetParentOrigin( ParentOrigin::TOP_CENTER );
popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+ mValueTextLabel = CreatePopupText();
+ popup.Add( mValueTextLabel );
+
return popup;
}
@@ -576,6 +581,8 @@ void Slider::CreateHandleValueDisplay()
mHandleValueTextLabel = Toolkit::TextLabel::New();
mHandleValueTextLabel.SetParentOrigin( ParentOrigin::CENTER );
mHandleValueTextLabel.SetAnchorPoint( AnchorPoint::CENTER );
+ mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
+ mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
mHandleValueTextLabel.SetDrawMode( DrawMode::OVERLAY );
mHandle.Add( mHandleValueTextLabel );
}
--
2.7.4