X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftext-label%2Ftext-label-example.cpp;h=a19531b98847650fc7e53bbd579bbf4c8a04be15;hb=3f7382d5b648974e4d3f9f6db2f3ce14fb01885b;hp=ef80cedb0dcb0714e229fb7c6d66d9f4ee3bb250;hpb=57ea82ed3dbed79a26f9a1293d98ac779fa7470c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index ef80ced..a19531b 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,19 +17,21 @@ /** * @file text-label-example.cpp - * @brief Basic usage of TextLabel control + * @brief Usage of TextLabel control with style application. */ // EXTERNAL INCLUDES #include #include -#include +#include +#include #include #include // INTERNAL INCLUDES #include "shared/multi-language-strings.h" #include "shared/view.h" +#include "expanding-buttons.h" using namespace Dali; using namespace Dali::Toolkit; @@ -38,15 +40,14 @@ using namespace MultiLanguageStrings; namespace { const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "grab-handle.png"; -const char* const STYLES_IMAGE = DEMO_IMAGE_DIR "FontStyleButton_Main.png"; -const char* const TICK_IMAGE_IMAGE = DEMO_IMAGE_DIR "FontStyleButton_OK_02.png"; const char* const STYLE_SELECTED_IMAGE = DEMO_IMAGE_DIR "FontStyleButton_OK_03.png"; const char* BUTTON_IMAGES[] = { DEMO_IMAGE_DIR "FontStyleButton_Colour.png", DEMO_IMAGE_DIR "FontStyleButton_Outline.png", - DEMO_IMAGE_DIR "FontStyleButton_Shadow.png" + DEMO_IMAGE_DIR "FontStyleButton_Shadow.png", + DEMO_IMAGE_DIR "FontStyleButton_Background.png" }; const unsigned int KEY_ZERO = 10; @@ -85,6 +86,7 @@ enum StyleType TEXT_COLOR = 0, OUTLINE, SHADOW, + BACKGROUND, NUMBER_OF_STYLES }; @@ -93,7 +95,8 @@ const Vector4 AVAILABLE_COLORS[] = Color::GREEN, Color::BLUE, Color::RED, - Color::CYAN + Color::CYAN, + Color::WHITE // Used as clear }; const unsigned int NUMBER_OF_COLORS = sizeof( AVAILABLE_COLORS ) / sizeof( AVAILABLE_COLORS[0u] ); @@ -129,10 +132,11 @@ struct HSVColorConstraint float value; }; -const float STYLE_BUTTON_POSTION_RELATIVE_TO_STAGE = 0.9f; -const float BUTTON_SIZE_RATIO_TO_STAGE = 0.1f; +const float STYLE_BUTTON_POSTION_RELATIVE_TO_WINDOW = 0.9f; +const float BUTTON_SIZE_RATIO_TO_WINDOW = 0.1f; const float OUTLINE_WIDTH = 2.0f; const Vector2 SHADOW_OFFSET = Vector2( 2.0f, 2.0f ); +const int GAP_BETWEEN_BUTTONS = 3; } // anonymous namespace @@ -147,9 +151,8 @@ public: TextLabelExample( Application& application ) : mApplication( application ), mLabel(), - mShadowActive( false ), - mOutlineActive( false ), mSelectedColor(AVAILABLE_COLORS[0]), + mStyleActivatedForColor( NUMBER_OF_STYLES ), mContainer(), mGrabCorner(), mBorder(), @@ -158,11 +161,19 @@ public: mLanguageId( 0u ), mAlignment( 0u ), mHueAngleIndex( Property::INVALID_INDEX ), - mOverrideMixColorIndex( Property::INVALID_INDEX ) - + mOverrideMixColorIndex( Property::INVALID_INDEX ), + mColorButtonsHidden( true ), + mCollapseColorsAndStyles( false ) { // Connect to the Application's Init signal mApplication.InitSignal().Connect( this, &TextLabelExample::Create ); + + // Set Style flags to inactive + for ( unsigned int i = TEXT_COLOR; i < NUMBER_OF_STYLES; i++ ) + { + mStyleActiveState[ i ] = false; + mCurrentStyleColor[i] = AVAILABLE_COLORS[ NUMBER_OF_COLORS - 1 ]; + } } ~TextLabelExample() @@ -170,31 +181,46 @@ public: // Nothing to do here. } + // Clicking the expanding button shows the registered style buttons. + void SetUpExpandingStyleButtons( Vector2 position ) + { + mExpandingButtons = Demo::ExpandingButtons::New(); + mExpandingButtons.SetProperty( Actor::Property::POSITION, Vector2( mButtonSize.width, mWindowSize.height * STYLE_BUTTON_POSTION_RELATIVE_TO_WINDOW )); + mExpandingButtons.CollapsingSignal().Connect( this, &TextLabelExample::OnExpandingButtonCollapsing ); + mExpandingButtons.SetProperty( Actor::Property::SIZE, mButtonSize ); + // Creates the buttons to be expanded + CreateStyleButtons(); + + // Register the created buttons with the ExpandingButtons. + for ( unsigned int index = 0; index < NUMBER_OF_STYLES; index++ ) + { + mExpandingButtons.RegisterButton( mStyleButtons[index] ); + } + } + /** * One-time setup in response to Application InitSignal. */ void Create( Application& application ) { - Stage stage = Stage::GetCurrent(); + Window window = application.GetWindow(); - stage.KeyEventSignal().Connect(this, &TextLabelExample::OnKeyEvent); - mStageSize = stage.GetSize(); - - mButtonSize = Size( mStageSize.height * 0.1, mStageSize.height * 0.1 ); // Button size 1/10 of stage height + window.KeyEventSignal().Connect(this, &TextLabelExample::OnKeyEvent); + mWindowSize = window.GetSize(); + mButtonSize = Size( mWindowSize.height * 0.1, mWindowSize.height * 0.1 ); // Button size 1/10 of window height mContainer = Control::New(); - mContainer.SetName( "Container" ); - mContainer.SetParentOrigin( ParentOrigin::CENTER ); - mLayoutSize = Vector2(mStageSize.width*0.6f, mStageSize.width*0.6f); - mContainer.SetSize( mLayoutSize ); - mContainer.SetDrawMode( DrawMode::OVERLAY_2D ); - stage.Add( mContainer ); + mContainer.SetProperty( Dali::Actor::Property::NAME, "Container" ); + mContainer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); + mLayoutSize = Vector2(mWindowSize.width*0.6f, mWindowSize.width*0.6f); + mContainer.SetProperty( Actor::Property::SIZE, mLayoutSize ); + window.Add( mContainer ); // Resize the center layout when the corner is grabbed mGrabCorner = ImageView::New( BACKGROUND_IMAGE ); - mGrabCorner.SetName( "GrabCorner" ); - mGrabCorner.SetAnchorPoint( AnchorPoint::TOP_CENTER ); - mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT ); + mGrabCorner.SetProperty( Dali::Actor::Property::NAME, "GrabCorner" ); + mGrabCorner.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER ); + mGrabCorner.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_RIGHT ); mGrabCorner.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); mContainer.Add( mGrabCorner ); @@ -204,44 +230,37 @@ public: mLabel = TextLabel::New( "\xF0\x9F\x98\x89 A Quick Brown Fox Jumps Over The Lazy Dog" ); - mLabel.SetName( "TextLabel" ); - mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - mLabel.SetSize(mLayoutSize); + mLabel.SetProperty( Dali::Actor::Property::NAME, "TextLabel" ); + mLabel.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + mLabel.SetProperty( Actor::Property::SIZE, mLayoutSize ); mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true ); mLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::GREEN ); mLabel.SetBackgroundColor( Color::WHITE ); mContainer.Add( mLabel ); - // Create style activate button - mStyleMenuButton = PushButton::New(); - mStyleMenuButton.SetPosition( mButtonSize.width, mStageSize.height * STYLE_BUTTON_POSTION_RELATIVE_TO_STAGE ); - mStyleMenuButton.SetSize( mButtonSize ); - mStyleMenuButton.SetProperty( Button::Property::TOGGLABLE, true ); - mStyleMenuButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, STYLES_IMAGE ); - mStyleMenuButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TICK_IMAGE_IMAGE ); - - mStyleMenuButton.ClickedSignal().Connect( this, &TextLabelExample::OnStyleButtonClicked ); - stage.Add( mStyleMenuButton ); + // Clicking ExpandingButton shows the Registered Style buttons, clicking again hides them. + Vector2 expandingButtonPosition( mButtonSize.width, mWindowSize.height * STYLE_BUTTON_POSTION_RELATIVE_TO_WINDOW ); + SetUpExpandingStyleButtons( expandingButtonPosition ); + window.Add( mExpandingButtons ); // Add a border for the container so you can see the container is being resized while grabbing the handle. mBorder = Control::New(); - mBorder.SetAnchorPoint( AnchorPoint::TOP_LEFT ); + mBorder.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); Dali::Property::Map border; border.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER ); border.Insert( BorderVisual::Property::COLOR, Color::WHITE ); - border.Insert( BorderVisual::Property::SIZE, 2.f ); + border.Insert( BorderVisual::Property::SIZE, 3.f ); mBorder.SetProperty( Control::Property::BACKGROUND, border ); mContainer.Add( mBorder ); - mBorder.SetVisible(false); - + mBorder.SetProperty( Actor::Property::VISIBLE,false); mGrabCorner.RaiseToTop(); mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f ); Renderer bgRenderer = mLabel.GetRendererAt(0); - mOverrideMixColorIndex = DevelHandle::GetPropertyIndex( bgRenderer, ColorVisual::Property::MIX_COLOR ); + mOverrideMixColorIndex = bgRenderer.GetPropertyIndex( ColorVisual::Property::MIX_COLOR ); Constraint constraint = Constraint::New( bgRenderer, mOverrideMixColorIndex, HSVColorConstraint(0.0f, 0.5f, 0.8f)); constraint.AddSource( Source( mLabel, mHueAngleIndex ) ); @@ -253,147 +272,300 @@ public: anim.SetLooping(true); anim.Play(); - // Animate the text color 3 times from source color to Yellow - Animation animation = Animation::New( 2.f ); - animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), Color::YELLOW, AlphaFunction::SIN ); - animation.SetLoopCount( 3 ); - animation.Play(); + mContainer.RaiseToTop(); + mGrabCorner.RaiseToTop(); Property::Value labelText = mLabel.GetProperty( TextLabel::Property::TEXT ); std::cout << "Displaying text: \"" << labelText.Get< std::string >() << "\"" << std::endl; } - // Depending on button pressed, apply the style to the text label - bool OnStyleSelected( Toolkit::Button button ) + // If the styling buttons should colapse (hide) then the color buttons should also hide. + bool OnExpandingButtonCollapsing( Demo::ExpandingButtons button ) + { + mCollapseColorsAndStyles = true; + HideColorButtons(); + return true; + } + + // Get the style type from the given button + StyleType GetStyleTypeFromButton( Toolkit::Button button ) + { + StyleType style = StyleType::TEXT_COLOR; + + if( button == mStyleButtons[ StyleType::OUTLINE ] ) + { + style = StyleType::OUTLINE; + } + else if( button == mStyleButtons[ StyleType::SHADOW ] ) + { + style = StyleType::SHADOW; + } + else if( button == mStyleButtons[ StyleType::BACKGROUND ] ) + { + style = StyleType::BACKGROUND; + } + return style; + } + + // Style selected, show color buttons + bool OnStyleButtonClicked( Toolkit::Button button ) { - if( button == mStyleButtons[ StyleType::TEXT_COLOR ] ) + StyleType selectedStyle = GetStyleTypeFromButton( button ); + if ( mStyleActivatedForColor == selectedStyle ) { - Animation animation = Animation::New( 2.f ); - animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), mSelectedColor, AlphaFunction::LINEAR ); - animation.Play(); + HideColorButtons(); } - else if( button == mStyleButtons[ StyleType::OUTLINE ] ) + else { - Property::Map outlineMap; - float outlineWidth = OUTLINE_WIDTH; + ResetColorButtons( mColorButtons, NUMBER_OF_COLORS ); + ShowColorButtons( selectedStyle); + } + return true; + } - if( mOutlineActive ) + // Set style to selected color + bool OnColorSelected( Toolkit::Button button ) + { + for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) + { + if ( mColorButtons[index] == button ) { - outlineWidth = ( mOutlineColor == mSelectedColor ) ? 0.0f : OUTLINE_WIDTH ; // toggles outline on/off + mSelectedColor = AVAILABLE_COLORS[ index ]; } - mOutlineActive = ( outlineWidth > 0.0f ) ? true : false; - - mOutlineColor = mSelectedColor; - outlineMap["color"] = mOutlineColor; - outlineMap["width"] = outlineWidth; - mLabel.SetProperty( TextLabel::Property::OUTLINE, outlineMap ); } - else if( button == mStyleButtons[ StyleType::SHADOW ] ) + + switch ( mStyleActivatedForColor ) { - Vector2 shadowOffset( SHADOW_OFFSET ); // Will be set to zeros if color already set - Property::Value value = mLabel.GetProperty( TextLabel::Property::SHADOW_COLOR ); - Vector4 currentShadowColor; - value.Get( currentShadowColor ); + case TEXT_COLOR : + { + Animation animation = Animation::New( 1.f ); + animation.AnimateTo( Property( mLabel, TextLabel::Property::TEXT_COLOR ), mSelectedColor, AlphaFunction::LINEAR ); + mCurrentStyleColor[ TEXT_COLOR ] = mSelectedColor; + animation.Play(); + break; + } + case OUTLINE : + { + Property::Map outlineMap; + float outlineWidth = OUTLINE_WIDTH; + + if( mStyleActiveState[ OUTLINE ] ) + { + outlineWidth = ( Color::WHITE == mSelectedColor ) ? 0.0f : OUTLINE_WIDTH ; // toggles outline on/off + } + mStyleActiveState[ OUTLINE ] = ( outlineWidth > 0.0f ) ? true : false; - if ( mShadowActive ) + outlineMap["color"] = mSelectedColor; + outlineMap["width"] = outlineWidth; + mCurrentStyleColor[ OUTLINE ] = mSelectedColor; + mLabel.SetProperty( TextLabel::Property::OUTLINE, outlineMap ); + break; + } + case SHADOW : { - // toggle shadow off ( zero offset ) if color is already set - shadowOffset = ( currentShadowColor == mSelectedColor ) ? Vector2::ZERO : Vector2( SHADOW_OFFSET ); + Vector2 shadowOffset( SHADOW_OFFSET ); // Will be set to zeros if color already set + Property::Value value = mLabel.GetProperty( TextLabel::Property::SHADOW ); + Vector4 currentShadowColor; + value.Get( currentShadowColor ); + + if ( mStyleActiveState[ SHADOW ] ) + { + // toggle shadow off ( zero offset ) if color is already set + shadowOffset = ( Color::WHITE == mSelectedColor ) ? Vector2::ZERO : Vector2( SHADOW_OFFSET ); + } + + mStyleActiveState[ SHADOW ] = ( shadowOffset == Vector2::ZERO ) ? false : true; + mCurrentStyleColor[ SHADOW ] = mSelectedColor; + + Property::Map shadowMap; + shadowMap.Insert( "offset", shadowOffset ); + shadowMap.Insert( "color", mSelectedColor ); + mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); + + break; } + case BACKGROUND : + { + Property::Map backgroundMap; + auto backgroundEnabled(true); + + if( mStyleActiveState[ BACKGROUND ] ) + { + backgroundEnabled = ( Color::WHITE != mSelectedColor ); // toggles background on/off + } + mStyleActiveState[ BACKGROUND ] = backgroundEnabled; - mShadowActive = ( shadowOffset == Vector2::ZERO ) ? false : true; + backgroundMap["color"] = mSelectedColor; + backgroundMap["enable"] = backgroundEnabled; + mCurrentStyleColor[ BACKGROUND ] = mSelectedColor; + mLabel.SetProperty( DevelTextLabel::Property::BACKGROUND, backgroundMap ); - Property::Map shadowMap; - shadowMap.Insert( "offset", shadowOffset ); - shadowMap.Insert( "color", mSelectedColor ); - shadowMap.Insert( "blurRadius", 2.0f ); - mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); + break; + } + default : + break; } + return true; } - bool OnColorSelected( Toolkit::Button button ) + // Set the inital color button that should be be selected. + // If the style already has a color set then that should be used + void SetInitialSelectedColorButton( StyleType styleButtonIndex ) { - for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) + Vector4 selectedColor = mCurrentStyleColor[ styleButtonIndex ]; + + for ( unsigned int i = 0; i < NUMBER_OF_COLORS; i++ ) { - if ( mColorButtons[index] == button ) + if ( AVAILABLE_COLORS[i] == selectedColor ) { - mSelectedColor = AVAILABLE_COLORS[ index ]; - return true; + if ( mColorButtons[i] ) + { + mColorButtons[ i ].SetProperty( Toolkit::Button::Property::SELECTED, true ); + } + break; } } - return true; } - void ShowColorButtons() + // Create a bar of color buttons that the user can select. + void ShowColorButtons( StyleType styleButtonIndex ) { + mCollapseColorsAndStyles = false; // Request to show colors so reset flag + mStyleActivatedForColor = styleButtonIndex; + for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) { - mColorButtons[index] = RadioButton::New(); - mColorButtons[index].SetPosition( mButtonSize.width, mStageSize.height * STYLE_BUTTON_POSTION_RELATIVE_TO_STAGE - ( mButtonSize.width * (index+1) ) ); - mColorButtons[index].SetSize( mButtonSize ); - mColorButtons[index].ClickedSignal().Connect( this, &TextLabelExample::OnColorSelected ); - mColorButtons[index].SetProperty( Button::Property::TOGGLABLE, true ); - Property::Map propertyMap; - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]); - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap ); - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, propertyMap ); - - propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); - propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]); - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap ); - - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER ) - .Add( BorderVisual::Property::COLOR, Color::WHITE ) - .Add( BorderVisual::Property::SIZE, 2.0f ) - .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); - - Stage::GetCurrent().Add( mColorButtons[index] ); + if( !mColorButtonsAnimation ) + { + mColorButtonsAnimation = Animation::New( 0.15f ); + mColorButtonsAnimation.FinishedSignal().Connect( this, &TextLabelExample::OnColorButtonAnimationFinished ); + } + + // Create a color button + if ( ! mColorButtons[index] ) + { + mColorButtons[index] = RadioButton::New(); + mColorButtons[index].SetProperty( Actor::Property::SIZE, mButtonSize ); + mColorButtons[index].ClickedSignal().Connect( this, &TextLabelExample::OnColorSelected ); + mColorButtons[index].SetProperty( Button::Property::TOGGLABLE, true ); + Property::Map propertyMap; + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]); + mColorButtons[index].SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap ); + mColorButtons[index].SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap ); + mColorButtons[index].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); + mColorButtons[index].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); + + + propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); + propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]); + mColorButtons[index].SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, propertyMap ); + + mColorButtons[index].SetProperty( Toolkit::Button::Property::SELECTED_VISUAL, + Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) + .Add( BorderVisual::Property::COLOR, Color::WHITE ) + .Add( BorderVisual::Property::SIZE, 4.0f ) + .Add( BorderVisual::Property::ANTI_ALIASING, true ) ); + + // Use a white button with 50% transparency as a clear color button + if ( Color::WHITE == AVAILABLE_COLORS[ index ] && styleButtonIndex != StyleType::TEXT_COLOR ) + { + mColorButtons[index].SetProperty( Actor::Property::OPACITY,0.5f); + + mColorButtons[index].SetProperty( Toolkit::Button::Property::LABEL, + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ) + .Add( Toolkit::TextVisual::Property::HORIZONTAL_ALIGNMENT, HorizontalAlignment::CENTER ) + .Add( Toolkit::TextVisual::Property::TEXT, "off") ); + + } + } + + SetInitialSelectedColorButton( mStyleActivatedForColor ); + + mColorButtons[index].Unparent(); + + mStyleButtons[styleButtonIndex].Add( mColorButtons[index] ); + mColorButtons[index].Lower(); + + // Position button using nice animation + mColorButtons[index].SetProperty( Actor::Property::POSITION_Y, -GAP_BETWEEN_BUTTONS ); + float desiredPosition = -( mButtonSize.height + GAP_BETWEEN_BUTTONS ) * (index); + AlphaFunction focusedAlphaFunction = AlphaFunction( Vector2 ( 0.32f, 0.08f ), Vector2( 0.38f, 1.72f ) ); + mColorButtonsAnimation.AnimateBy( Property( mColorButtons[index], Actor::Property::POSITION_Y ), desiredPosition, focusedAlphaFunction ); } - } + mColorButtonsHidden = false; + mColorButtonsAnimation.Play(); + } - void HideColorButtons() + // Remove the color buttons when not being shown. + void ResetColorButtons( Button buttons[], unsigned int numberOfButtons ) { - for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) + for( unsigned int index = 0; index < numberOfButtons; index++) { - UnparentAndReset( mColorButtons[index] ); + UnparentAndReset( buttons[index] ); } } - void HideStyleButtons() + void OnColorButtonAnimationFinished( Animation& animation ) { - for( unsigned int index = 0; index < NUMBER_OF_STYLES; index++) + animation.Clear(); + if ( mColorButtonsHidden ) { - UnparentAndReset( mStyleButtons[index] ); + ResetColorButtons( mColorButtons, NUMBER_OF_COLORS ); + animation.Reset(); // Handle reset + if ( mCollapseColorsAndStyles ) + { + mExpandingButtons.Collapse(); + } } } - bool OnStyleButtonClicked( Toolkit::Button button ) + // Create the style buttons that will expand from the expanding button. + void CreateStyleButtons() { - if ( button.GetProperty( Toolkit::Button::Property::SELECTED ).Get() ) + for ( unsigned int index = 0; index < NUMBER_OF_STYLES; index++ ) { - for ( unsigned int index = 0; index < NUMBER_OF_STYLES; index++ ) + if ( ! mStyleButtons[index] ) { mStyleButtons[index] = PushButton::New(); - mStyleButtons[index].SetPosition( mButtonSize.width + ( mButtonSize.width * (index+1) ), mStageSize.height * STYLE_BUTTON_POSTION_RELATIVE_TO_STAGE ); - mStyleButtons[index].SetSize( mButtonSize ); - mStyleButtons[index].SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_IMAGES[ index ] ); - mStyleButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, STYLE_SELECTED_IMAGE ); - mStyleButtons[index].ClickedSignal().Connect( this, &TextLabelExample::OnStyleSelected ); - Stage::GetCurrent().Add( mStyleButtons[index] ); + mStyleButtons[index].SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_IMAGES[ index ] ); + mStyleButtons[index].SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, STYLE_SELECTED_IMAGE ); + mStyleButtons[index].SetProperty( Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + mStyleButtons[index].SetProperty( Actor::Property::SIZE, mButtonSize ); + mStyleButtons[index].ClickedSignal().Connect( this, &TextLabelExample::OnStyleButtonClicked ); + } + } + } + + // Animate away the color bar. + void HideColorButtons() + { + if ( ! mColorButtonsHidden ) + { + for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) + { + mColorButtonsAnimation.AnimateTo( Property( mColorButtons[index], Actor::Property::POSITION_Y ), 0.0f ); } - ShowColorButtons(); + mColorButtonsHidden = true; + mColorButtonsAnimation.Play(); + } + mStyleActivatedForColor = NUMBER_OF_STYLES; + } + + // Request the expanding button to collapse. + void HideStyleAndColorButtons() + { + mCollapseColorsAndStyles = true; + if ( mColorButtonsHidden ) + { + mExpandingButtons.Collapse(); } else { - // hide menu and colors HideColorButtons(); - HideStyleButtons(); } - return true; } // Resize the text-label with pan gesture @@ -413,7 +585,9 @@ public: } // Only show the border during the panning - mBorder.SetVisible(true); + mBorder.SetProperty( Actor::Property::VISIBLE,true); + + HideStyleAndColorButtons(); } mLayoutSize.x += gesture.displacement.x * 2.0f; @@ -422,21 +596,21 @@ public: if( mLayoutSize.x >= 2.0f || mLayoutSize.y >= 2.0f ) { - mLayoutSize.x = std::min ( mLayoutSize.x, mStageSize.width ); - mLayoutSize.y = std::min ( mLayoutSize.y, mStageSize.height*.9f ); + mLayoutSize.x = std::min ( mLayoutSize.x, mWindowSize.width ); + mLayoutSize.y = std::min ( mLayoutSize.y, mWindowSize.height*.9f ); // Avoid pixel mis-alignment issue Vector2 clampedSize = Vector2( std::max( ConvertToEven( static_cast( mLayoutSize.x )), 2 ), std::max( ConvertToEven( static_cast( mLayoutSize.y )), 2 ) ); - mContainer.SetSize( clampedSize ); + mContainer.SetProperty( Actor::Property::SIZE, clampedSize ); } if( gesture.state == Gesture::Cancelled || gesture.state == Gesture::Finished ) { // Resize the text label to match the container size when panning is finished - mLabel.SetSize(mLayoutSize); - mBorder.SetVisible(false); + mLabel.SetProperty( Actor::Property::SIZE, mLayoutSize ); + mBorder.SetProperty( Actor::Property::VISIBLE,false); } } @@ -459,7 +633,7 @@ public: case KEY_ZERO: // fall through case KEY_ONE: { - mLabel.SetProperty( TextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 ); + mLabel.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 ); break; } case KEY_A: // Animate text colour @@ -522,13 +696,19 @@ public: } case KEY_S: // Shadow color { - if( Color::BLACK == mLabel.GetProperty( TextLabel::Property::SHADOW_COLOR ) ) + Property::Value value = mLabel.GetProperty( TextLabel::Property::SHADOW ); + Vector4 shadowColor; + value.Get( shadowColor ); + Property::Map shadowMap; + if( Color::BLACK == shadowColor ) { - mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::RED ); + shadowMap.Insert( "color", Color::RED ); + mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); } else { - mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK ); + shadowMap.Insert( "color", Color::BLACK ); + mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); } break; } @@ -540,12 +720,26 @@ public: } case KEY_PLUS: // Increase shadow offset { - mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, mLabel.GetProperty( TextLabel::Property::SHADOW_OFFSET ) + Vector2( 1.0f, 1.0f ) ); + Property::Value value = mLabel.GetProperty( TextLabel::Property::SHADOW ); + Vector2 shadowOffset; + value.Get( shadowOffset ); + shadowOffset += Vector2( 1.0f, 1.0f ); + + Property::Map shadowMap; + shadowMap.Insert( "offset", shadowOffset ); + mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); break; } case KEY_MINUS: // Decrease shadow offset { - mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, mLabel.GetProperty( TextLabel::Property::SHADOW_OFFSET ) - Vector2( 1.0f, 1.0f ) ); + Property::Value value = mLabel.GetProperty( TextLabel::Property::SHADOW ); + Vector2 shadowOffset; + value.Get( shadowOffset ); + shadowOffset -= Vector2( 1.0f, 1.0f ); + + Property::Map shadowMap; + shadowMap.Insert( "offset", shadowOffset ); + mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap ); break; } @@ -560,14 +754,18 @@ private: TextLabel mLabel; - PushButton mStyleMenuButton; + Demo::ExpandingButtons mExpandingButtons; PushButton mStyleButtons[ NUMBER_OF_STYLES ]; - bool mShadowActive; - bool mOutlineActive; + bool mStyleActiveState[ NUMBER_OF_STYLES ]; + + Vector4 mCurrentStyleColor[NUMBER_OF_STYLES ]; + Vector4 mSelectedColor; - Vector4 mOutlineColor; // Store outline as Vector4 whilst TextLabel Outline Property returns a string when using GetProperty + Button mColorButtons[ NUMBER_OF_COLORS ]; + StyleType mStyleActivatedForColor; // The style that the color bar is connected to + Control mContainer; Control mGrabCorner; Control mBorder; @@ -576,13 +774,18 @@ private: Vector2 mLayoutSize; - Size mStageSize; + Animation mColorButtonsAnimation; + + Size mWindowSize; Size mButtonSize; unsigned int mLanguageId; unsigned int mAlignment; Property::Index mHueAngleIndex; Property::Index mOverrideMixColorIndex; + + bool mColorButtonsHidden; + bool mCollapseColorsAndStyles; }; int DALI_EXPORT_API main( int argc, char **argv )