From: David Steele Date: Fri, 22 Sep 2017 14:24:47 +0000 (+0100) Subject: [dali_1.2.58] Merge branch 'devel/master' X-Git-Tag: dali_1.4.10~74 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45ee15fa0cf9e522ac0072c5d35596dfdda59561;hp=73b9e0adcc530bdef14669fe6ee318a4169aaf5b;p=platform%2Fcore%2Fuifw%2Fdali-demo.git [dali_1.2.58] Merge branch 'devel/master' Change-Id: I6f90d9f3fdf65d10e004df91ca1bef31d7344cba --- diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index 5952d59..f2b0802 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -38,6 +39,16 @@ 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" +}; const unsigned int KEY_ZERO = 10; const unsigned int KEY_ONE = 11; @@ -70,6 +81,24 @@ const char* V_ALIGNMENT_STRING_TABLE[] = const unsigned int V_ALIGNMENT_STRING_COUNT = sizeof( V_ALIGNMENT_STRING_TABLE ) / sizeof( V_ALIGNMENT_STRING_TABLE[0u] ); +enum StyleType +{ + TEXT_COLOR = 0, + OUTLINE, + SHADOW, + NUMBER_OF_STYLES +}; + +const Vector4 AVAILABLE_COLORS[] = +{ + Color::GREEN, + Color::BLUE, + Color::RED, + Color::CYAN +}; + +const unsigned int NUMBER_OF_COLORS = sizeof( AVAILABLE_COLORS ) / sizeof( AVAILABLE_COLORS[0u] ); + int ConvertToEven(int value) { return (value % 2 == 0) ? value : (value + 1); @@ -101,6 +130,12 @@ 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 OUTLINE_WIDTH = 2.0f; +const Vector2 SHADOW_OFFSET = Vector2( 2.0f, 2.0f ); + + } // anonymous namespace /** @@ -113,6 +148,9 @@ public: TextLabelExample( Application& application ) : mApplication( application ), mLabel(), + mShadowActive( false ), + mOutlineActive( false ), + mSelectedColor(AVAILABLE_COLORS[0]), mContainer(), mGrabCorner(), mBorder(), @@ -122,6 +160,7 @@ public: mAlignment( 0u ), mHueAngleIndex( Property::INVALID_INDEX ), mOverrideMixColorIndex( Property::INVALID_INDEX ) + { // Connect to the Application's Init signal mApplication.InitSignal().Connect( this, &TextLabelExample::Create ); @@ -140,12 +179,14 @@ public: Stage stage = Stage::GetCurrent(); stage.KeyEventSignal().Connect(this, &TextLabelExample::OnKeyEvent); - Vector2 stageSize = stage.GetSize(); + mStageSize = stage.GetSize(); + + mButtonSize = Size( mStageSize.height * 0.1, mStageSize.height * 0.1 ); // Button size 1/10 of stage height mContainer = Control::New(); mContainer.SetName( "Container" ); mContainer.SetParentOrigin( ParentOrigin::CENTER ); - mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f); + mLayoutSize = Vector2(mStageSize.width*0.6f, mStageSize.width*0.6f); mContainer.SetSize( mLayoutSize ); mContainer.SetDrawMode( DrawMode::OVERLAY_2D ); stage.Add( mContainer ); @@ -162,18 +203,27 @@ public: mPanGestureDetector.Attach( mGrabCorner ); mPanGestureDetector.DetectedSignal().Connect( this, &TextLabelExample::OnPan ); - mLabel = TextLabel::New( "A Quick Brown Fox Jumps Over The Lazy Dog" ); + 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( TextLabel::Property::MULTI_LINE, true ); mLabel.SetProperty( DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE, Color::GREEN ); - mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 1.0f, 1.0f ) ); - mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK ); 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 ); + // 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 ); @@ -204,7 +254,7 @@ public: anim.SetLooping(true); anim.Play(); - // Animate the text color 3 times from source color to RED + // Animate the text color 3 times from source color to Yellow Animation animation = Animation::New( 2.f ); animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), Color::YELLOW, AlphaFunction::SIN ); animation.SetLoopCount( 3 ); @@ -214,6 +264,136 @@ public: 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( button == mStyleButtons[ StyleType::TEXT_COLOR ] ) + { + Animation animation = Animation::New( 2.f ); + animation.AnimateTo( Property( mLabel, DevelTextLabel::Property::TEXT_COLOR_ANIMATABLE ), mSelectedColor, AlphaFunction::LINEAR ); + animation.Play(); + } + else if( button == mStyleButtons[ StyleType::OUTLINE ] ) + { + Property::Map outlineMap; + float outlineWidth = OUTLINE_WIDTH; + + if( mOutlineActive ) + { + outlineWidth = ( mOutlineColor == mSelectedColor ) ? 0.0f : OUTLINE_WIDTH ; // toggles outline on/off + } + 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 ] ) + { + 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 ); + + if ( mShadowActive ) + { + // toggle shadow off ( zero offset ) if color is already set + shadowOffset = ( currentShadowColor == mSelectedColor ) ? Vector2::ZERO : Vector2( SHADOW_OFFSET ); + } + + mShadowActive = ( shadowOffset == Vector2::ZERO ) ? false : true; + + mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, shadowOffset ); + mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, mSelectedColor ); + } + return true; + } + + bool OnColorSelected( Toolkit::Button button ) + { + for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) + { + if ( mColorButtons[index] == button ) + { + mSelectedColor = AVAILABLE_COLORS[ index ]; + return true; + } + } + return true; + } + + void ShowColorButtons() + { + 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( 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] ); + } + } + + + void HideColorButtons() + { + for( unsigned int index = 0; index < NUMBER_OF_COLORS; index++) + { + UnparentAndReset( mColorButtons[index] ); + } + } + + void HideStyleButtons() + { + for( unsigned int index = 0; index < NUMBER_OF_STYLES; index++) + { + UnparentAndReset( mStyleButtons[index] ); + } + } + + bool OnStyleButtonClicked( Toolkit::Button button ) + { + if ( button.GetProperty( Toolkit::Button::Property::SELECTED ).Get() ) + { + for ( unsigned int index = 0; index < NUMBER_OF_STYLES; 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] ); + } + ShowColorButtons(); + } + else + { + // hide menu and colors + HideColorButtons(); + HideStyleButtons(); + } + return true; + } + // Resize the text-label with pan gesture void OnPan( Actor actor, const PanGesture& gesture ) { @@ -240,6 +420,9 @@ 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 ); + // Avoid pixel mis-alignment issue Vector2 clampedSize = Vector2( std::max( ConvertToEven( static_cast( mLayoutSize.x )), 2 ), std::max( ConvertToEven( static_cast( mLayoutSize.y )), 2 ) ); @@ -375,6 +558,14 @@ private: TextLabel mLabel; + PushButton mStyleMenuButton; + PushButton mStyleButtons[ NUMBER_OF_STYLES ]; + bool mShadowActive; + bool mOutlineActive; + Vector4 mSelectedColor; + Vector4 mOutlineColor; // Store outline as Vector4 whilst TextLabel Outline Property returns a string when using GetProperty + Button mColorButtons[ NUMBER_OF_COLORS ]; + Control mContainer; Control mGrabCorner; Control mBorder; @@ -383,6 +574,9 @@ private: Vector2 mLayoutSize; + Size mStageSize; + Size mButtonSize; + unsigned int mLanguageId; unsigned int mAlignment; Property::Index mHueAngleIndex; diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 5a6934e..f270e4b 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.2.57 +Version: 1.2.58 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/resources/images/FontStyleButton_Colour.png b/resources/images/FontStyleButton_Colour.png new file mode 100755 index 0000000..f7f5afc Binary files /dev/null and b/resources/images/FontStyleButton_Colour.png differ diff --git a/resources/images/FontStyleButton_Main.png b/resources/images/FontStyleButton_Main.png new file mode 100755 index 0000000..b2b76c8 Binary files /dev/null and b/resources/images/FontStyleButton_Main.png differ diff --git a/resources/images/FontStyleButton_OK_02.png b/resources/images/FontStyleButton_OK_02.png new file mode 100755 index 0000000..07f2dc7 Binary files /dev/null and b/resources/images/FontStyleButton_OK_02.png differ diff --git a/resources/images/FontStyleButton_OK_03.png b/resources/images/FontStyleButton_OK_03.png new file mode 100755 index 0000000..d5255e1 Binary files /dev/null and b/resources/images/FontStyleButton_OK_03.png differ diff --git a/resources/images/FontStyleButton_Outline.png b/resources/images/FontStyleButton_Outline.png new file mode 100755 index 0000000..7f1bfdf Binary files /dev/null and b/resources/images/FontStyleButton_Outline.png differ diff --git a/resources/images/FontStyleButton_Shadow.png b/resources/images/FontStyleButton_Shadow.png new file mode 100755 index 0000000..a1defbe Binary files /dev/null and b/resources/images/FontStyleButton_Shadow.png differ