Commit 7c0f7319c39be07c459ca0d24d9bc9e9ac86386e
Committed by
Gerrit Code Review
Gerrit Code Review
Merge "(Layouting) Use gradient instead for background & fix change layout butto…
…n on target" into devel/master
Showing
2 changed files
with
23 additions
and
4 deletions
examples/layouting/layouting-examples.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2018 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2019 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -37,8 +37,11 @@ using namespace Dali::Toolkit; |
| 37 | 37 | |
| 38 | 38 | namespace |
| 39 | 39 | { |
| 40 | +const Vector4 BACKGROUND_GRADIENT_1 = Vector4( 0.0f, 0.352941176f, 0.654901961f, 1.0f ); | |
| 41 | +const Vector4 BACKGROUND_GRADIENT_2 = Vector4( 1.0f, 0.992156863f, 0.894117647f, 1.0f ); | |
| 42 | +const Vector2 BACKGROUND_GRADIENT_START_POSITION( 0.0f, -0.5f ); | |
| 43 | +const Vector2 BACKGROUND_GRADIENT_END_POSITION( 0.0f, 0.5f ); | |
| 40 | 44 | |
| 41 | -const char* BACKGROUND_IMAGE( DEMO_IMAGE_DIR "lake_front.jpg" ); | |
| 42 | 45 | const char* TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" ); |
| 43 | 46 | |
| 44 | 47 | typedef std::unique_ptr< Demo::Example > ExamplePointer; |
| ... | ... | @@ -78,8 +81,16 @@ private: |
| 78 | 81 | auto stage = Stage::GetCurrent(); |
| 79 | 82 | stage.KeyEventSignal().Connect( this, &LayoutingExample::OnKeyEvent ); |
| 80 | 83 | |
| 81 | - auto bg = ImageView::New( BACKGROUND_IMAGE ); | |
| 84 | + auto bg = Control::New(); | |
| 82 | 85 | bg.SetParentOrigin( ParentOrigin::CENTER ); |
| 86 | + bg.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); | |
| 87 | + bg.SetProperty( | |
| 88 | + Control::Property::BACKGROUND, | |
| 89 | + Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::GRADIENT ) | |
| 90 | + .Add( GradientVisual::Property::STOP_COLOR, Property::Array().Add( BACKGROUND_GRADIENT_1 ) | |
| 91 | + .Add( BACKGROUND_GRADIENT_2 ) ) | |
| 92 | + .Add( GradientVisual::Property::START_POSITION, BACKGROUND_GRADIENT_START_POSITION ) | |
| 93 | + .Add( GradientVisual::Property::END_POSITION, BACKGROUND_GRADIENT_END_POSITION ) ); | |
| 83 | 94 | stage.Add( bg ); |
| 84 | 95 | auto toolbar = ImageView::New( TOOLBAR_IMAGE ); |
| 85 | 96 | toolbar.SetParentOrigin( ParentOrigin::TOP_CENTER ); |
| ... | ... | @@ -97,7 +108,8 @@ private: |
| 97 | 108 | toolbar.Add( mToolbarTitle ); |
| 98 | 109 | |
| 99 | 110 | mNextLayout = PushButton::New(); |
| 100 | - mNextLayout.SetProperty( Toolkit::Button::Property::LABEL, "change layout"); | |
| 111 | + mNextLayout.SetStyleName( "ChangeLayoutButton" ); | |
| 112 | + mNextLayout.SetProperty( Toolkit::Button::Property::LABEL, "Change Layout" ); | |
| 101 | 113 | mNextLayout.ClickedSignal().Connect( this, &LayoutingExample::ChangeLayout ); |
| 102 | 114 | mNextLayout.SetParentOrigin( ParentOrigin::TOP_RIGHT ); |
| 103 | 115 | mNextLayout.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); | ... | ... |
resources/style/mobile/demo-theme.json.in