Peter M. Groen / dali-demo

Commit b0f915f0c9a23aeef30cb795ded797e1b692f00e

Authored by György Straub
1 parent 537af6b6

Renaming of enum values for coding standards compliance. 

Change-Id: I0b6ce4ed15976ad481029c689606014550e3145f
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Inline Side-by-side
Showing 26 changed files with 55 additions and 55 deletions
examples/blocks/blocks-example.cpp
  View file @b0f915f
... ... @@ -262,7 +262,7 @@ public:
262 262 APPLICATION_TITLE );
263 263  
264 264 // Add an extra space on the right to center the title text.
265   - toolBar.AddControl( Actor::New(), DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight );
  265 + toolBar.AddControl( Actor::New(), DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT );
266 266  
267 267 // Create the content layer, which is where game actors appear.
268 268 AddContentLayer();
... ...
examples/bubble-effect/bubble-effect-example.cpp
  View file @b0f915f
... ... @@ -113,7 +113,7 @@ private:
113 113 mChangeBackgroundButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked );
114 114 toolBar.AddControl( mChangeBackgroundButton,
115 115 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
116   - Toolkit::Alignment::HorizontalRight,
  116 + Toolkit::Alignment::HORIZONTAL_RIGHT,
117 117 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
118 118 // Add a button to change bubble shape. ( left of bar )
119 119 mChangeBubbleShapeButton = Toolkit::PushButton::New();
... ... @@ -122,7 +122,7 @@ private:
122 122 mChangeBubbleShapeButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked );
123 123 toolBar.AddControl( mChangeBubbleShapeButton,
124 124 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
125   - Toolkit::Alignment::HorizontalLeft,
  125 + Toolkit::Alignment::HORIZONTAL_LEFT,
126 126 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
127 127  
128 128 // Create and initialize the BubbleEmitter object
... ...
examples/builder/examples.cpp
  View file @b0f915f
... ... @@ -252,7 +252,7 @@ public:
252 252 {
253 253 mTitleActor = DemoHelper::CreateToolBarLabel( "" );
254 254 // Add title to the tool bar.
255   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  255 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER );
256 256 }
257 257  
258 258 mTitleActor.SetProperty( TextLabel::Property::TEXT, title );
... ... @@ -482,7 +482,7 @@ public:
482 482 backButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED );
483 483 backButton.ClickedSignal().Connect( this, &ExampleApp::OnBackButtonPressed);
484 484 backButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
485   - mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  485 + mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
486 486  
487 487 mNavigationView = Toolkit::NavigationView::New();
488 488 mNavigationView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
... ...
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @b0f915f
... ... @@ -227,18 +227,18 @@ void CubeTransitionApp::OnInit( Application&amp; application )
227 227 );
228 228  
229 229 effectChangeToggleButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnEffectButtonClicked );
230   - mToolBar.AddControl( effectChangeToggleButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  230 + mToolBar.AddControl( effectChangeToggleButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
231 231  
232 232 // Add title to the tool bar.
233 233 mTitle = DemoHelper::CreateToolBarLabel( APPLICATION_TITLE_WAVE );
234   - mToolBar.AddControl( mTitle, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
  234 + mToolBar.AddControl( mTitle, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HORIZONTAL_CENTER );
235 235  
236 236 //Add an slideshow icon on the right of the title
237 237 mSlideshowButton = Toolkit::PushButton::New();
238 238 mSlideshowButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON );
239 239 mSlideshowButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON_SELECTED );
240 240 mSlideshowButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnSildeshowButtonClicked );
241   - mToolBar.AddControl( mSlideshowButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
  241 + mToolBar.AddControl( mSlideshowButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_CENTER, DemoHelper::DEFAULT_PLAY_PADDING );
242 242  
243 243 // Set size to window size to avoid seeing a black border on transition
244 244 mViewSize = application.GetWindow().GetSize();
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @b0f915f
... ... @@ -226,18 +226,18 @@ void DissolveEffectApp::OnInit( Application&amp; application )
226 226 mEffectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE );
227 227 mEffectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE_SELECTED );
228 228 mEffectChangeButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnEffectButtonClicked );
229   - mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  229 + mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
230 230  
231 231 // Add title to the tool bar.
232 232 mTitleActor = DemoHelper::CreateToolBarLabel( APPLICATION_TITLE_HIGHP );
233   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
  233 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HORIZONTAL_CENTER );
234 234  
235 235 // Add an slide-show button on the right of the title
236 236 mPlayStopButton = Toolkit::PushButton::New();
237 237 mPlayStopButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON );
238 238 mPlayStopButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED );
239 239 mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked );
240   - mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
  240 + mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_CENTER, DemoHelper::DEFAULT_PLAY_PADDING );
241 241  
242 242 // use pan gesture to detect the cursor or finger movement
243 243 mPanGestureDetector = PanGestureDetector::New();
... ...
examples/effects-view/effects-view-example.cpp
  View file @b0f915f
... ... @@ -136,7 +136,7 @@ void EffectsViewApp::OnAppInitialize( Application&amp; application )
136 136 viewButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, VIEW_SWAP_SELECTED_IMAGE );
137 137 // Connects the view change button clicked signal to the OnView method.
138 138 viewButton.ClickedSignal().Connect( this, &EffectsViewApp::ChangeEffectSize );
139   - mToolBar.AddControl( viewButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  139 + mToolBar.AddControl( viewButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
140 140  
141 141 Vector2 effectsViewSize( mWindowSize.width, mWindowSize.height * 0.25f );
142 142 mDropShadowView = CreateEffectsView( EffectsView::DROP_SHADOW, effectsViewSize, mEffectSize );
... ... @@ -216,7 +216,7 @@ void EffectsViewApp::SetTitle(int effectSize)
216 216 {
217 217 mTitleActor = DemoHelper::CreateToolBarLabel( title.str() );
218 218 // Add title to the tool bar.
219   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
  219 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HORIZONTAL_CENTER );
220 220 }
221 221 mTitleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, title.str() );
222 222 }
... ...
examples/flex-container/flex-container-example.cpp
  View file @b0f915f
... ... @@ -141,7 +141,7 @@ public:
141 141 mFlexDirectionButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-change-selected.png" );
142 142 mFlexDirectionButton.ClickedSignal().Connect( this, &FlexContainerExample::OnFlexDirectionButtonClicked);
143 143 mFlexDirectionButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
144   - mToolBar.AddControl( mFlexDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  144 + mToolBar.AddControl( mFlexDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
145 145  
146 146 // Create a flex wrap toggle button. (left of toolbar)
147 147 mFlexWrapButton = Toolkit::PushButton::New();
... ... @@ -150,7 +150,7 @@ public:
150 150 mFlexWrapButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-edit-selected.png" );
151 151 mFlexWrapButton.ClickedSignal().Connect( this, &FlexContainerExample::OnFlexWrapButtonClicked);
152 152 mFlexWrapButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
153   - mToolBar.AddControl( mFlexWrapButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  153 + mToolBar.AddControl( mFlexWrapButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
154 154  
155 155 // Create a content direction toggle button. (left of toolbar)
156 156 mContentDirectionButton = Toolkit::PushButton::New();
... ... @@ -159,7 +159,7 @@ public:
159 159 mContentDirectionButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-replace-selected.png" );
160 160 mContentDirectionButton.ClickedSignal().Connect( this, &FlexContainerExample::OnContentDirectionButtonClicked);
161 161 mContentDirectionButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
162   - mToolBar.AddControl( mContentDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  162 + mToolBar.AddControl( mContentDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
163 163  
164 164 // Create a justify content toggle button. (right of toolbar)
165 165 mJustifyContentButton = Toolkit::PushButton::New();
... ... @@ -168,7 +168,7 @@ public:
168 168 mJustifyContentButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-reset-selected.png" );
169 169 mJustifyContentButton.ClickedSignal().Connect( this, &FlexContainerExample::OnJustifyContentButtonClicked);
170 170 mJustifyContentButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
171   - mToolBar.AddControl( mJustifyContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  171 + mToolBar.AddControl( mJustifyContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
172 172  
173 173 // Create a align items toggle button. (right of toolbar)
174 174 mAlignItemsButton = Toolkit::PushButton::New();
... ... @@ -177,7 +177,7 @@ public:
177 177 mAlignItemsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-highp-selected.png" );
178 178 mAlignItemsButton.ClickedSignal().Connect( this, &FlexContainerExample::OnAlignItemsButtonClicked);
179 179 mAlignItemsButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
180   - mToolBar.AddControl( mAlignItemsButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  180 + mToolBar.AddControl( mAlignItemsButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
181 181  
182 182 // Create a align content toggle button. (right of toolbar)
183 183 mAlignContentButton = Toolkit::PushButton::New();
... ... @@ -186,7 +186,7 @@ public:
186 186 mAlignContentButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-effect-cross-selected.png" );
187 187 mAlignContentButton.ClickedSignal().Connect( this, &FlexContainerExample::OnAlignContentButtonClicked);
188 188 mAlignContentButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
189   - mToolBar.AddControl( mAlignContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  189 + mToolBar.AddControl( mAlignContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
190 190  
191 191 // Create the base flex container
192 192 mFlexContainer = FlexContainer::New();
... ... @@ -317,7 +317,7 @@ private:
317 317 {
318 318 mTitleActor = DemoHelper::CreateToolBarLabel( "" );
319 319 // Add title to the tool bar.
320   - mToolBar.AddControl( mTitleActor, VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  320 + mToolBar.AddControl( mTitleActor, VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER );
321 321 }
322 322  
323 323 // Update the title and property value
... ...
examples/gradients/gradients-example.cpp
  View file @b0f915f
... ... @@ -79,7 +79,7 @@ public:
79 79 changeButton.ClickedSignal().Connect( this, &GradientController::OnChangeIconClicked );
80 80 toolBar.AddControl( changeButton,
81 81 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
82   - Toolkit::Alignment::HorizontalRight,
  82 + Toolkit::Alignment::HORIZONTAL_RIGHT,
83 83 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
84 84  
85 85 PushButton roundedCornerButton = Toolkit::PushButton::New();
... ... @@ -88,7 +88,7 @@ public:
88 88 roundedCornerButton.ClickedSignal().Connect( this, &GradientController::OnRoundedCornerClicked );
89 89 toolBar.AddControl( roundedCornerButton,
90 90 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
91   - Toolkit::Alignment::HorizontalCenter,
  91 + Toolkit::Alignment::HORIZONTAL_CENTER,
92 92 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
93 93  
94 94 mGradientControl = Control::New();
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @b0f915f
... ... @@ -318,7 +318,7 @@ public:
318 318 toggleScalingButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE );
319 319 toggleScalingButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE_SELECTED );
320 320 toggleScalingButton.ClickedSignal().Connect( this, &ImageScalingIrregularGridController::OnToggleScalingTouched );
321   - mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  321 + mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
322 322  
323 323 SetTitle( APPLICATION_TITLE );
324 324  
... ... @@ -370,14 +370,14 @@ public:
370 370 mGridActor = imageField;
371 371  
372 372 // Create the scroll bar
373   - mScrollBarVertical = ScrollBar::New(Toolkit::ScrollBar::Vertical);
  373 + mScrollBarVertical = ScrollBar::New(Toolkit::ScrollBar::VERTICAL);
374 374 mScrollBarVertical.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_RIGHT);
375 375 mScrollBarVertical.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_RIGHT);
376 376 mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::HEIGHT);
377 377 mScrollBarVertical.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH);
378 378 mScrollView.Add(mScrollBarVertical);
379 379  
380   - mScrollBarHorizontal = ScrollBar::New(Toolkit::ScrollBar::Horizontal);
  380 + mScrollBarHorizontal = ScrollBar::New(Toolkit::ScrollBar::HORIZONTAL);
381 381 mScrollBarHorizontal.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::BOTTOM_LEFT);
382 382 mScrollBarHorizontal.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
383 383 mScrollBarHorizontal.SetResizePolicy(Dali::ResizePolicy::FIT_TO_CHILDREN, Dali::Dimension::WIDTH);
... ... @@ -600,7 +600,7 @@ public:
600 600 {
601 601 mTitleActor = DemoHelper::CreateToolBarLabel( "" );
602 602 // Add title to the tool bar.
603   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  603 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER );
604 604 }
605 605  
606 606 mTitleActor.SetProperty( TextLabel::Property::TEXT, title );
... ...
examples/image-view-pixel-area/image-view-pixel-area-example.cpp
  View file @b0f915f
... ... @@ -75,7 +75,7 @@ private:
75 75 switchButton.ClickedSignal().Connect( this, &ImageViewPixelAreaApp::OnButtonClicked );
76 76 toolBar.AddControl( switchButton,
77 77 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
78   - Toolkit::Alignment::HorizontalRight,
  78 + Toolkit::Alignment::HORIZONTAL_RIGHT,
79 79 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
80 80  
81 81  
... ...
examples/image-view-url/image-view-url-example.cpp
  View file @b0f915f
... ... @@ -92,7 +92,7 @@ private:
92 92 switchButton.ClickedSignal().Connect( this, &ImageViewUrlApp::OnButtonClicked );
93 93 toolBar.AddControl( switchButton,
94 94 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
95   - Toolkit::Alignment::HorizontalRight,
  95 + Toolkit::Alignment::HORIZONTAL_RIGHT,
96 96 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
97 97  
98 98 std::string url = mUrl;
... ...
examples/item-view/item-view-example.cpp
  View file @b0f915f
... ... @@ -218,7 +218,7 @@ public:
218 218 editButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED );
219 219 editButton.ClickedSignal().Connect( this, &ItemViewExample::OnModeButtonClicked);
220 220 editButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
221   - mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  221 + mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
222 222  
223 223 // Create a layout toggle button. (right of toolbar)
224 224 mLayoutButton = Toolkit::PushButton::New();
... ... @@ -226,7 +226,7 @@ public:
226 226 mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED );
227 227 mLayoutButton.ClickedSignal().Connect( this, &ItemViewExample::OnLayoutButtonClicked);
228 228 mLayoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
229   - mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  229 + mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
230 230  
231 231 // Create a delete button (bottom right of screen)
232 232 mDeleteButton = Toolkit::PushButton::New();
... ... @@ -952,7 +952,7 @@ private:
952 952 {
953 953 mTitleActor = DemoHelper::CreateToolBarLabel( "" );
954 954 // Add title to the tool bar.
955   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  955 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER );
956 956 }
957 957  
958 958 mTitleActor.SetProperty( TextLabel::Property::TEXT, title );
... ...
examples/magnifier/magnifier-example.cpp
  View file @b0f915f
... ... @@ -233,7 +233,7 @@ public:
233 233 constraint.AddSource( LocalSource(Actor::Property::PARENT_ORIGIN) );
234 234 constraint.AddSource( LocalSource(Actor::Property::ANCHOR_POINT) );
235 235 constraint.AddSource( ParentSource(Actor::Property::SIZE) );
236   - constraint.SetRemoveAction(Constraint::Discard);
  236 + constraint.SetRemoveAction(Constraint::DISCARD);
237 237 constraint.Apply();
238 238  
239 239 // Create bouncing magnifier automatically bounces around screen.
... ...
examples/motion-blur/motion-blur-example.cpp
  View file @b0f915f
... ... @@ -173,7 +173,7 @@ public:
173 173 mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
174 174 mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
175 175 mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked );
176   - mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
  176 + mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_CENTER, DemoHelper::DEFAULT_PLAY_PADDING );
177 177  
178 178 // Creates a mode button.
179 179 // Create a effect toggle button. (right of toolbar)
... ... @@ -182,7 +182,7 @@ public:
182 182 layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
183 183 layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked);
184 184 layoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
185   - mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  185 + mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
186 186  
187 187 // Input
188 188 mTapGestureDetector = TapGestureDetector::New();
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @b0f915f
... ... @@ -152,7 +152,7 @@ public:
152 152 mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
153 153 mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
154 154 mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked );
155   - mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
  155 + mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_CENTER, DemoHelper::DEFAULT_PLAY_PADDING );
156 156  
157 157 // Creates a mode button.
158 158 // Create a effect toggle button. (right of toolbar)
... ... @@ -161,7 +161,7 @@ public:
161 161 layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
162 162 layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked);
163 163 layoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
164   - mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  164 + mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
165 165  
166 166 // Input
167 167 mTapGestureDetector = TapGestureDetector::New();
... ...
examples/popup/popup-example.cpp
  View file @b0f915f
... ... @@ -132,7 +132,7 @@ public:
132 132  
133 133 // Add title to the tool bar.
134 134 const float padding( DemoHelper::DEFAULT_VIEW_STYLE.mToolBarPadding );
135   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
  135 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HORIZONTAL_CENTER, Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
136 136  
137 137 // Create animation button.
138 138 mAnimationButton = Toolkit::PushButton::New();
... ... @@ -140,7 +140,7 @@ public:
140 140 mAnimationButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, ANIMATION_ZOOM_ICON_IMAGE );
141 141 mAnimationButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true );
142 142 mAnimationButton.ClickedSignal().Connect( this, &PopupExample::OnAnimationClicked );
143   - mToolBar.AddControl( mAnimationButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  143 + mToolBar.AddControl( mAnimationButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
144 144  
145 145 // Create context button.
146 146 mContextButton = Toolkit::PushButton::New();
... ... @@ -148,7 +148,7 @@ public:
148 148 mContextButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CONTEXT_ENABLED_ICON_IMAGE );
149 149 mContextButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true );
150 150 mContextButton.ClickedSignal().Connect( this, &PopupExample::OnContextClicked );
151   - mToolBar.AddControl( mContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  151 + mToolBar.AddControl( mContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
152 152  
153 153 // Add title to the tool bar.
154 154 mItemView = Toolkit::ItemView::New( *this );
... ...
examples/ray-marching/ray-marching-example.cpp
  View file @b0f915f
... ... @@ -132,7 +132,7 @@ public:
132 132 APPLICATION_TITLE );
133 133  
134 134 // Add an extra space on the right to center the title text.
135   - mToolBar.AddControl( Actor::New(), DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight );
  135 + mToolBar.AddControl( Actor::New(), DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT );
136 136  
137 137 AddContentLayer();
138 138  
... ...
examples/refraction-effect/refraction-effect-example.cpp
  View file @b0f915f
... ... @@ -266,7 +266,7 @@ private:
266 266 mChangeTextureButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeTexture );
267 267 toolBar.AddControl( mChangeTextureButton,
268 268 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
269   - Toolkit::Alignment::HorizontalRight,
  269 + Toolkit::Alignment::HORIZONTAL_RIGHT,
270 270 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
271 271 // Add a button to change mesh pattern. ( left of bar )
272 272 mChangeMeshButton = Toolkit::PushButton::New();
... ... @@ -275,7 +275,7 @@ private:
275 275 mChangeMeshButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeMesh );
276 276 toolBar.AddControl( mChangeMeshButton,
277 277 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
278   - Toolkit::Alignment::HorizontalLeft,
  278 + Toolkit::Alignment::HORIZONTAL_LEFT,
279 279 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
280 280  
281 281  
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @b0f915f
... ... @@ -188,7 +188,7 @@ public:
188 188 // Create a effect change button. (right of toolbar)
189 189 mEffectChangeButton = Toolkit::PushButton::New();
190 190 mEffectChangeButton.ClickedSignal().Connect( this, &ExampleController::OnEffectTouched );
191   - mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  191 + mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
192 192  
193 193 // Create the content layer.
194 194 AddContentLayer();
... ... @@ -536,7 +536,7 @@ private:
536 536 {
537 537 mTitleActor = DemoHelper::CreateToolBarLabel( "" );
538 538 // Add title to the tool bar.
539   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  539 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER );
540 540 }
541 541  
542 542 mTitleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, title );
... ...
examples/shadows-and-lights/shadows-and-lights-example.cpp
  View file @b0f915f
... ... @@ -169,11 +169,11 @@ public:
169 169 effectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_EFFECT_IMAGE );
170 170 effectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_EFFECT_IMAGE_SELECTED );
171 171 effectChangeButton.ClickedSignal().Connect( this, &TestApp::OnEffectButtonClicked );
172   - toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  172 + toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
173 173  
174 174 // Add title to the tool bar.
175 175 mTitleActor = DemoHelper::CreateToolBarLabel( "" );
176   - toolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter );
  176 + toolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HORIZONTAL_CENTER );
177 177  
178 178 // Set Title text
179 179 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_PAN_LIGHT) );
... ... @@ -183,7 +183,7 @@ public:
183 183 resetButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, RESET_ICON );
184 184 resetButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, RESET_ICON_SELECTED );
185 185 resetButton.ClickedSignal().Connect( this, &TestApp::OnResetPressed );
186   - toolBar.AddControl( resetButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
  186 + toolBar.AddControl( resetButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_CENTER, DemoHelper::DEFAULT_PLAY_PADDING );
187 187  
188 188 // Setup
189 189 mView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ) );
... ...
examples/size-negotiation/size-negotiation-example.cpp
  View file @b0f915f
... ... @@ -131,7 +131,7 @@ public:
131 131  
132 132 // Add title to the tool bar.
133 133 const float padding( DemoHelper::DEFAULT_VIEW_STYLE.mToolBarPadding );
134   - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HorizontalCenter, Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
  134 + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Toolkit::Alignment::HORIZONTAL_CENTER, Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
135 135  
136 136 mItemView = Toolkit::ItemView::New( *this );
137 137 mItemView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
... ...
examples/text-editor/text-editor-example.cpp
  View file @b0f915f
... ... @@ -147,7 +147,7 @@ public:
147 147 mColorContainer.Add( mColorButtonOption );
148 148  
149 149 //Add label to toolbar, which will also add the color button next to it.
150   - mToolBar.AddControl( colorLabel, viewStyle.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  150 + mToolBar.AddControl( colorLabel, viewStyle.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
151 151  
152 152 // Create the text editor.
153 153 mEditor = TextEditor::New();
... ...
examples/text-label/text-label-example.cpp
  View file @b0f915f
... ... @@ -264,7 +264,7 @@ public:
264 264  
265 265 Constraint constraint = Constraint::New<Vector3>( bgRenderer, mOverrideMixColorIndex, HSVColorConstraint(0.0f, 0.5f, 0.8f));
266 266 constraint.AddSource( Source( mLabel, mHueAngleIndex ) );
267   - constraint.SetRemoveAction( Constraint::Discard );
  267 + constraint.SetRemoveAction( Constraint::DISCARD );
268 268 constraint.Apply();
269 269  
270 270 Animation anim = Animation::New(50.0f);
... ...
examples/text-memory-profiling/text-memory-profiling-example.cpp
  View file @b0f915f
... ... @@ -290,7 +290,7 @@ public:
290 290 mTitle.SetProperty( TextLabel::Property::TEXT, "Select the type of text" );
291 291  
292 292 // Add title to the tool bar.
293   - mToolBar.AddControl( mTitle, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter );
  293 + mToolBar.AddControl( mTitle, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER );
294 294  
295 295 // Create a layer to contain dynamically created text labels
296 296 mLayer = Layer::New();
... ... @@ -306,7 +306,7 @@ public:
306 306 backButton.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, BACK_IMAGE_SELECTED );
307 307 backButton.ClickedSignal().Connect( this, &TextMemoryProfilingExample::OnBackButtonPressed );
308 308 backButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
309   - mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
  309 + mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Alignment::HORIZONTAL_LEFT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
310 310  
311 311 // Create a navigation view to navigate different types of text labels
312 312 mNavigationView = NavigationView::New();
... ...
shared/dali-table-view.cpp
  View file @b0f915f
... ... @@ -523,7 +523,7 @@ Actor DaliTableView::CreateTile( const std::string&amp; name, const std::string&amp; tit
523 523 // and pass it to the shader uniform, along with the tile's position.
524 524 Constraint shaderPosition = Constraint::New < Vector3 > ( focusableTile, propertyIndex, TileShaderPositionConstraint( mPageWidth, position.x ) );
525 525 shaderPosition.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) );
526   - shaderPosition.SetRemoveAction( Constraint::Discard );
  526 + shaderPosition.SetRemoveAction( Constraint::DISCARD );
527 527 shaderPosition.Apply();
528 528 //focusableTile.Add( tileContent );
529 529  
... ... @@ -748,7 +748,7 @@ void DaliTableView::InitialiseBackgroundActors( Actor actor )
748 748 animConstraint.AddSource( Source( mScrollView, ScrollView::Property::SCROLL_POSITION ) );
749 749 animConstraint.AddSource( Dali::ParentSource( Dali::Actor::Property::SIZE ) );
750 750 animConstraint.AddSource( Dali::LocalSource( Dali::Actor::Property::SIZE ) );
751   - animConstraint.SetRemoveAction( Constraint::Discard );
  751 + animConstraint.SetRemoveAction( Constraint::DISCARD );
752 752 animConstraint.Apply();
753 753  
754 754 // Kickoff animation
... ...
shared/view.h
  View file @b0f915f
... ... @@ -92,7 +92,7 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar&amp; toolBar,
92 92  
93 93 // Add title to the tool bar.
94 94 const float padding( style.mToolBarPadding );
95   - toolBar.AddControl( label, style.mToolBarTitlePercentage, Dali::Toolkit::Alignment::HorizontalCenter, Dali::Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
  95 + toolBar.AddControl( label, style.mToolBarTitlePercentage, Dali::Toolkit::Alignment::HORIZONTAL_CENTER, Dali::Toolkit::Alignment::Padding( padding, padding, padding, padding ) );
96 96 }
97 97  
98 98 return toolBarLayer;
... ...