From: Adeel Kazmi Date: Fri, 5 Aug 2016 15:20:24 +0000 (-0700) Subject: Merge "Added style names for images and text labels of Slider" into devel/master X-Git-Tag: dali_1.2.1~12 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=abca32188329599dcf40c33af47d2a650bba9ffd;hp=9a0a0915f7139722178f3aa2495d9dfa94044f94 Merge "Added style names for images and text labels of Slider" into devel/master --- diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 915db02..de7e5c6 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -102,7 +102,6 @@ const Vector4 DEFAULT_DISABLED_COLOR( 0.5f, 0.5f, 0.5f, 1.0f ); const float VALUE_POPUP_MARGIN = 10.0f; const float VALUE_POPUP_HEIGHT = 81.0f; const float VALUE_POPUP_MIN_WIDTH = 54.0f; -const Vector2 VALUE_POPUP_ARROW_SIZE( 18.0f, 18.0f ); const float DEFAULT_LOWER_BOUND = 0.0f; const float DEFAULT_UPPER_BOUND = 1.0f; @@ -208,9 +207,14 @@ void Slider::OnInitialize() void Slider::OnSizeSet( const Vector3& size ) { - // Factor in handle overshoot into size of track +} + +void Slider::OnRelayout( const Vector2& size, RelayoutContainer& container ) +{ SetHitRegion( Vector2( size.x, GetHitRegion().y ) ); + // Factor in handle overshoot into size of backing SetTrackRegion( Vector2( size.x - GetHandleSize().x, GetTrackRegion().y ) ); + Control::OnRelayout( size, container ); } bool Slider::OnTouch(Actor actor, const TouchData& touch) @@ -383,9 +387,9 @@ Actor Slider::CreateHitRegion() Toolkit::ImageView Slider::CreateTrack() { Toolkit::ImageView track = Toolkit::ImageView::New(); + track.SetName("SliderTrack"); track.SetParentOrigin( ParentOrigin::CENTER ); track.SetAnchorPoint( AnchorPoint::CENTER ); - return track; } @@ -445,6 +449,7 @@ std::string Slider::GetTrackVisual() Toolkit::ImageView Slider::CreateProgress() { Toolkit::ImageView progress = Toolkit::ImageView::New(); + progress.SetName("SliderProgress"); progress.SetParentOrigin( ParentOrigin::CENTER_LEFT ); progress.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); @@ -568,6 +573,7 @@ void Slider::ResizeProgressRegion( const Vector2& region ) Toolkit::ImageView Slider::CreateHandle() { Toolkit::ImageView handle = Toolkit::ImageView::New(); + handle.SetName("SliderHandle"); handle.SetParentOrigin( ParentOrigin::CENTER_LEFT ); handle.SetAnchorPoint( AnchorPoint::CENTER ); @@ -577,6 +583,8 @@ Toolkit::ImageView Slider::CreateHandle() Toolkit::ImageView Slider::CreatePopupArrow() { Toolkit::ImageView arrow = Toolkit::ImageView::New(); + arrow.SetStyleName("SliderPopupArrow"); + arrow.SetName("SliderPopupArrow"); arrow.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); arrow.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); @@ -586,6 +594,8 @@ Toolkit::ImageView Slider::CreatePopupArrow() Toolkit::TextLabel Slider::CreatePopupText() { Toolkit::TextLabel textLabel = Toolkit::TextLabel::New(); + textLabel.SetName( "SliderPopupTextLabel" ); + textLabel.SetStyleName( "SliderPopupTextLabel" ); textLabel.SetParentOrigin( ParentOrigin::CENTER ); textLabel.SetAnchorPoint( AnchorPoint::CENTER ); textLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); @@ -598,6 +608,7 @@ Toolkit::TextLabel Slider::CreatePopupText() Toolkit::ImageView Slider::CreatePopup() { Toolkit::ImageView popup = Toolkit::ImageView::New(); + popup.SetName( "SliderPopup" ); popup.SetParentOrigin( ParentOrigin::TOP_CENTER ); popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH ); @@ -668,6 +679,8 @@ void Slider::CreateHandleValueDisplay() if( mHandle && !mHandleValueTextLabel ) { mHandleValueTextLabel = Toolkit::TextLabel::New(); + mHandleValueTextLabel.SetName("SliderHandleTextLabel"); + mHandleValueTextLabel.SetStyleName("SliderHandleTextLabel"); mHandleValueTextLabel.SetParentOrigin( ParentOrigin::CENTER ); mHandleValueTextLabel.SetAnchorPoint( AnchorPoint::CENTER ); mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h index f2c81b2..7879f37 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.h +++ b/dali-toolkit/internal/controls/slider/slider-impl.h @@ -286,6 +286,12 @@ protected: */ virtual void OnSizeSet( const Vector3& size ); + /** + * @copydoc CustomActorImpl::OnRelayout + */ + virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + + private: /** diff --git a/dali-toolkit/internal/visuals/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp index 9125acd..e430c7b 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.cpp +++ b/dali-toolkit/internal/visuals/image/image-visual.cpp @@ -501,7 +501,6 @@ void ImageVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer( mImage ); } - } void ImageVisual::DoSetOffStage( Actor& actor ) diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 6eec362..8c5eb2a 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -820,6 +820,7 @@ void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Ty { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } + RelayoutRequest(); } void Control::OnPinch(const PinchGesture& pinch) diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json index a97bab8..fd8e1a4 100644 --- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json @@ -57,6 +57,13 @@ { "pointSize":25 }, + "radiobutton": + { + "unselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected.png", + "selectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected.png", + "disabledUnselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected-disabled.png", + "disabledSelectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected-disabled.png" + }, "textfield": { @@ -151,6 +158,36 @@ "confirmationpopup": { "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png" + }, + "slider": + { + "showPopup": true, + "showValue": true, + "valuePrecision": 0, + "trackVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin.9.png", + "size":[27,27] + }, + "progressVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png", + "size":[27,27] + }, + "handleVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin-handle.png", + "size":[72,72] + }, + "popupVisual":"{DALI_IMAGE_DIR}slider-popup.9.png", + "popupArrowVisual":"{DALI_IMAGE_DIR}slider-popup-arrow.9.png", + "disableColor":[0.5, 0.5, 0.5, 1.0], + "popupTextColor":[0.5,0.5,0.5,1.0], + "hitRegion":[0, 72], + "marks":[], + "snapToMarks":false, + "markTolerance":0.05 + }, + "SliderHandleTextLabel": + { + "textColor":[0.8,0.8,1,1] } } } diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index 850b3b9..0a6f61f 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -57,6 +57,13 @@ { "pointSize":25 }, + "radiobutton": + { + "unselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected.png", + "selectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected.png", + "disabledUnselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected-disabled.png", + "disabledSelectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected-disabled.png" + }, "textfield": { @@ -143,6 +150,44 @@ "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" } + }, + "popup": + { + "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png" + }, + "confirmationpopup": + { + "popupBackgroundImage":"{DALI_IMAGE_DIR}00_popup_bg.9.png" + }, + "slider": + { + "showPopup": true, + "showValue": true, + "valuePrecision": 0, + "trackVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin.9.png", + "size":[27,27] + }, + "progressVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png", + "size":[27,27] + }, + "handleVisual":{ + "url":"{DALI_IMAGE_DIR}slider-skin-handle.png", + "size":[72,72] + }, + "popupVisual":"{DALI_IMAGE_DIR}slider-popup.9.png", + "popupArrowVisual":"{DALI_IMAGE_DIR}slider-popup-arrow.9.png", + "disableColor":[0.5, 0.5, 0.5, 1.0], + "popupTextColor":[0.5,0.5,0.5,1.0], + "hitRegion":[0, 72], + "marks":[], + "snapToMarks":false, + "markTolerance":0.05 + }, + "SliderHandleTextLabel": + { + "textColor":[0.8,0.8,1,1] } } }