Peter M. Groen / dali-demo

Commit d59e156051bffbef9e31abbb217a929427017f72

Authored by Paul Wisbey
2 parents cb64d707 9dd83514

Merge remote-tracking branch 'origin/tizen' into new_text 

Change-Id: I18093fe9a0e8e429074f36e5fff26de207940c3f
Inline Side-by-side
Showing 6 changed files with 71 additions and 66 deletions
demo/dali-table-view.cpp
  View file @d59e156
... ... @@ -53,10 +53,10 @@ const int MAX_PAGES = 256; ///< Maximum pag
53 53 const int EXAMPLES_PER_ROW = 3;
54 54 const int ROWS_PER_PAGE = 3;
55 55 const int EXAMPLES_PER_PAGE = EXAMPLES_PER_ROW * ROWS_PER_PAGE;
56   -const int BOTTOM_PADDING_HEIGHT = 40;
57   -const int LOGO_MARGIN = 50;
  56 +const float LOGO_MARGIN_RATIO = 0.5f / 0.9f;
  57 +const float BOTTOM_PADDING_RATIO = 0.4f / 0.9f;
58 58 const Vector3 SCROLLVIEW_RELATIVE_SIZE(0.9f, 1.0f, 0.8f ); ///< ScrollView's relative size to its parent
59   -const Vector3 TABLE_RELATIVE_SIZE(0.9f, 1.0f, 0.8f ); ///< TableView's relative size to the entire stage. The Y value will be calculated.
  59 +const Vector3 TABLE_RELATIVE_SIZE(0.9f, 0.9f, 0.8f ); ///< TableView's relative size to the entire stage. The Y value means sum of the logo and table relative heights.
60 60 const float STENCIL_RELATIVE_SIZE = 1.0f;
61 61  
62 62 const float EFFECT_SNAP_DURATION = 0.66f; ///< Scroll Snap Duration for Effects
... ... @@ -276,11 +276,13 @@ void DaliTableView::Initialize( Application&amp; application )
276 276  
277 277 // Add logo
278 278 mLogo = CreateLogo( LOGO_PATH );
279   - const float logoHeight = mLogo.GetImage().GetHeight() + DP(LOGO_MARGIN);
  279 + const float paddingHeight = ( ( 1.f-TABLE_RELATIVE_SIZE.y ) * stageSize.y );
  280 + const float logoMargin = paddingHeight * LOGO_MARGIN_RATIO;
  281 + const float logoHeight = mLogo.GetImage().GetHeight() + logoMargin;
280 282 mRootActor.SetFixedHeight( 1, logoHeight );
281 283  
282   - mButtonsPageRelativeSize = Vector3( TABLE_RELATIVE_SIZE.x, ( stageSize.height - toolbarHeight - logoHeight - DP( BOTTOM_PADDING_HEIGHT ) ) / stageSize.height, TABLE_RELATIVE_SIZE.z );
283   -
  284 + const float bottomMargin = paddingHeight * BOTTOM_PADDING_RATIO;
  285 + mButtonsPageRelativeSize = Vector3( TABLE_RELATIVE_SIZE.x, 1.f - ( toolbarHeight + logoHeight + bottomMargin) / stageSize.height, TABLE_RELATIVE_SIZE.z );
284 286 mRootActor.SetFixedHeight( 2, mButtonsPageRelativeSize.y * stageSize.height );
285 287  
286 288 Alignment alignment = Alignment::New();
... ...
examples/buttons/buttons-example.cpp
  View file @d59e156
... ... @@ -58,7 +58,7 @@ const char* const BIG_IMAGE_3 = DALI_IMAGE_DIR &quot;gallery-large-13.jpg&quot;;
58 58 const char* const ENABLED_IMAGE = DALI_IMAGE_DIR "item-select-check.png";
59 59  
60 60 const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
61   -const char* const PUSHBUTTON_DIM_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
  61 +const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
62 62 const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
63 63  
64 64 const char* const CHECKBOX_UNCHECKED_IMAGE = DALI_IMAGE_DIR "checkbox-unchecked.png";
... ... @@ -148,7 +148,7 @@ class ButtonsController: public ConnectionTracker
148 148 mRadioButtonImage1.SetParentOrigin( ParentOrigin::TOP_LEFT );
149 149 mRadioButtonImage1.SetAnchorPoint( AnchorPoint::TOP_LEFT );
150 150 mRadioButtonImage1.SetPosition( 0, DP(radioY) );
151   - mRadioButtonImage1.SetActive( true );
  151 + mRadioButtonImage1.SetSelected( true );
152 152  
153 153 radioButtonsGroup2.Add( mRadioButtonImage1 );
154 154 }
... ... @@ -188,11 +188,11 @@ class ButtonsController: public ConnectionTracker
188 188 mUpdateButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
189 189 mUpdateButton.SetAnchorPoint( AnchorPoint::TOP_CENTER );
190 190 mUpdateButton.SetPosition( 0, DP(MARGIN_SIZE) );
191   - mUpdateButton.SetLabelText("Select");
  191 + mUpdateButton.SetLabel("Select");
192 192 mUpdateButton.SetSize( DP(100), DP(BUTTON_HEIGHT) );
193 193  
194   - mUpdateButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
195   - mUpdateButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  194 + mUpdateButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  195 + mUpdateButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
196 196 mUpdateButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
197 197  
198 198 mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
... ... @@ -244,9 +244,9 @@ class ButtonsController: public ConnectionTracker
244 244 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
245 245 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
246 246 radioButton.SetPosition( 0, 0 );
247   - radioButton.SetActive( true );
  247 + radioButton.SetSelected( true );
248 248  
249   - radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
  249 + radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
250 250  
251 251 radioButtonsGroup1.Add( radioButton );
252 252 }
... ... @@ -259,7 +259,7 @@ class ButtonsController: public ConnectionTracker
259 259 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
260 260 radioButton.SetPosition( 0, DP(50) );
261 261  
262   - radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
  262 + radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
263 263  
264 264 radioButtonsGroup1.Add( radioButton );
265 265 }
... ... @@ -288,7 +288,7 @@ class ButtonsController: public ConnectionTracker
288 288 checkBox.SetBackgroundImage( unchecked );
289 289 checkBox.SetCheckedImage( checked );
290 290 checkBox.SetSize( DP(48), DP(48) );
291   - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
  291 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
292 292  
293 293 checkBoxBackground.Add( checkBox );
294 294 }
... ... @@ -304,7 +304,7 @@ class ButtonsController: public ConnectionTracker
304 304 checkBox.SetCheckedImage( checked );
305 305 checkBox.SetSize( DP(48), DP(48) );
306 306 checkBox.SetChecked( true );
307   - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
  307 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
308 308  
309 309 checkBoxBackground.Add( checkBox );
310 310 }
... ... @@ -319,7 +319,7 @@ class ButtonsController: public ConnectionTracker
319 319 checkBox.SetBackgroundImage( unchecked );
320 320 checkBox.SetCheckedImage( checked );
321 321 checkBox.SetSize( DP(48), DP(48) );
322   - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
  322 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
323 323  
324 324 checkBoxBackground.Add( checkBox );
325 325 }
... ... @@ -339,14 +339,14 @@ class ButtonsController: public ConnectionTracker
339 339 toggleButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
340 340 toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
341 341 toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
342   - toggleButton.SetLabelText( "Toggle OFF" );
  342 + toggleButton.SetLabel( "Toggle OFF" );
343 343 toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) );
344 344  
345   - toggleButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
346   - toggleButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  345 + toggleButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  346 + toggleButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
347 347 toggleButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
348 348  
349   - toggleButton.ToggledSignal().Connect( this, &ButtonsController::OnButtonToggled );
  349 + toggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonToggled );
350 350  
351 351 toggleBackground.Add( toggleButton );
352 352 }
... ... @@ -370,11 +370,11 @@ class ButtonsController: public ConnectionTracker
370 370 {
371 371 if( state )
372 372 {
373   - pushButton.SetLabelText( "Toggle ON" );
  373 + pushButton.SetLabel( "Toggle ON" );
374 374 }
375 375 else
376 376 {
377   - pushButton.SetLabelText( "Toggle OFF" );
  377 + pushButton.SetLabel( "Toggle OFF" );
378 378 }
379 379 }
380 380  
... ... @@ -385,11 +385,11 @@ class ButtonsController: public ConnectionTracker
385 385 {
386 386 if( button.GetName() == "radio-select-enable" && state == true )
387 387 {
388   - mUpdateButton.SetDimmed( false );
  388 + mUpdateButton.SetDisabled( false );
389 389 }
390 390 else if( button.GetName() == "radio-select-disable" && state == true )
391 391 {
392   - mUpdateButton.SetDimmed( true );
  392 + mUpdateButton.SetDisabled( true );
393 393 }
394 394  
395 395 return true;
... ... @@ -397,15 +397,15 @@ class ButtonsController: public ConnectionTracker
397 397  
398 398 bool OnButtonClicked(Toolkit::Button button)
399 399 {
400   - if( mRadioButtonImage1.IsActive() )
  400 + if( mRadioButtonImage1.IsSelected() )
401 401 {
402 402 mImage.SetImage( mBigImage1 );
403 403 }
404   - else if( mRadioButtonImage2.IsActive() )
  404 + else if( mRadioButtonImage2.IsSelected() )
405 405 {
406 406 mImage.SetImage( mBigImage2 );
407 407 }
408   - else if( mRadioButtonImage3.IsActive() )
  408 + else if( mRadioButtonImage3.IsSelected() )
409 409 {
410 410 mImage.SetImage( mBigImage3 );
411 411 }
... ...
examples/logging/logging-example.cpp
  View file @d59e156
... ... @@ -79,7 +79,7 @@ const Vector4 BACKGROUND_COLOUR( 1.0f, 1.0f, 1.0f, 0.15f );
79 79  
80 80 const char* const PUSHBUTTON_PRESS_IMAGE = DALI_IMAGE_DIR "button-down.9.png";
81 81 const char* const PUSHBUTTON_BUTTON_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
82   -const char* const PUSHBUTTON_DIM_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
  82 +const char* const PUSHBUTTON_DISABLED_IMAGE = DALI_IMAGE_DIR "button-disabled.9.png";
83 83  
84 84 // Button IDs
85 85 const char* const LOGGER_1_RADIO_ID = "LOGGER_1_RADIO";
... ... @@ -214,9 +214,9 @@ class LoggingController: public ConnectionTracker
214 214 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
215 215 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
216 216 radioButton.SetPosition( DP(radioX), DP(radioY) );
217   - radioButton.SetActive( true );
  217 + radioButton.SetSelected( true );
218 218  
219   - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
  219 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
220 220  
221 221 radioButtonsGroup.Add( radioButton );
222 222 mLogRadioButtons[0] = radioButton;
... ... @@ -232,7 +232,7 @@ class LoggingController: public ConnectionTracker
232 232 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
233 233 radioButton.SetPosition( DP(radioX), DP(radioY) );
234 234  
235   - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
  235 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
236 236  
237 237 radioButtonsGroup.Add( radioButton );
238 238 mLogRadioButtons[1] = radioButton;
... ... @@ -248,7 +248,7 @@ class LoggingController: public ConnectionTracker
248 248 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
249 249 radioButton.SetPosition( DP(radioX), DP(radioY) );
250 250  
251   - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
  251 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
252 252  
253 253 radioButtonsGroup.Add( radioButton );
254 254 mLogRadioButtons[2] = radioButton;
... ... @@ -270,15 +270,15 @@ class LoggingController: public ConnectionTracker
270 270 {
271 271 Toolkit::PushButton button = Toolkit::PushButton::New();
272 272 button.SetName( CREATE_BUTTON_ID );
273   - button.SetLabelText( CREATE_BUTTON_TEXT );
  273 + button.SetLabel( CREATE_BUTTON_TEXT );
274 274 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
275 275 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
276 276 button.SetPosition( buttonXDP, 0 );
277 277 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
278 278  
279   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  279 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
280 280 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
281   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  281 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
282 282  
283 283 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
284 284  
... ... @@ -290,15 +290,15 @@ class LoggingController: public ConnectionTracker
290 290  
291 291 Toolkit::PushButton button = Toolkit::PushButton::New();
292 292 button.SetName( DELETE_BUTTON_ID );
293   - button.SetLabelText( DELETE_BUTTON_TEXT );
  293 + button.SetLabel( DELETE_BUTTON_TEXT );
294 294 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
295 295 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
296 296 button.SetPosition( buttonXDP, 0 );
297 297 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
298 298  
299   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  299 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
300 300 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
301   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  301 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
302 302  
303 303 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
304 304  
... ... @@ -321,15 +321,15 @@ class LoggingController: public ConnectionTracker
321 321 {
322 322 Toolkit::PushButton button = Toolkit::PushButton::New();
323 323 button.SetName( START_BUTTON_ID );
324   - button.SetLabelText( START_BUTTON_TEXT );
  324 + button.SetLabel( START_BUTTON_TEXT );
325 325 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
326 326 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
327 327 button.SetPosition( buttonXDP, 0 );
328 328 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
329 329  
330   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  330 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
331 331 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
332   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  332 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
333 333  
334 334 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
335 335  
... ... @@ -341,15 +341,15 @@ class LoggingController: public ConnectionTracker
341 341  
342 342 Toolkit::PushButton button = Toolkit::PushButton::New();
343 343 button.SetName( STOP_BUTTON_ID );
344   - button.SetLabelText( STOP_BUTTON_TEXT );
  344 + button.SetLabel( STOP_BUTTON_TEXT );
345 345 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
346 346 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
347 347 button.SetPosition( buttonXDP, 0 );
348 348 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
349 349  
350   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  350 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
351 351 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
352   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  352 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
353 353  
354 354 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
355 355  
... ... @@ -372,15 +372,15 @@ class LoggingController: public ConnectionTracker
372 372 {
373 373 Toolkit::PushButton button = Toolkit::PushButton::New();
374 374 button.SetName( ENABLE_BUTTON_ID );
375   - button.SetLabelText( ENABLE_BUTTON_TEXT );
  375 + button.SetLabel( ENABLE_BUTTON_TEXT );
376 376 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
377 377 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
378 378 button.SetPosition( buttonXDP, 0 );
379 379 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
380 380  
381   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  381 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
382 382 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
383   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  383 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
384 384  
385 385 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
386 386  
... ... @@ -392,15 +392,15 @@ class LoggingController: public ConnectionTracker
392 392  
393 393 Toolkit::PushButton button = Toolkit::PushButton::New();
394 394 button.SetName( DISABLE_BUTTON_ID );
395   - button.SetLabelText( DISABLE_BUTTON_TEXT );
  395 + button.SetLabel( DISABLE_BUTTON_TEXT );
396 396 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
397 397 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
398 398 button.SetPosition( buttonXDP, 0 );
399 399 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
400 400  
401   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  401 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
402 402 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
403   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  403 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
404 404  
405 405 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
406 406  
... ... @@ -439,7 +439,7 @@ class LoggingController: public ConnectionTracker
439 439 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
440 440 radioButton.SetPosition( DP(radioX), DP(radioY) );
441 441  
442   - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
  442 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
443 443  
444 444 frequencyRadioButtonsGroup.Add( radioButton );
445 445 mFrequencyRadioButtons[0] = radioButton;
... ... @@ -454,9 +454,9 @@ class LoggingController: public ConnectionTracker
454 454 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
455 455 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
456 456 radioButton.SetPosition( DP(radioX), DP(radioY) );
457   - radioButton.SetActive( true );
  457 + radioButton.SetSelected( true );
458 458  
459   - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
  459 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
460 460  
461 461 frequencyRadioButtonsGroup.Add( radioButton );
462 462 mFrequencyRadioButtons[1] = radioButton;
... ... @@ -472,7 +472,7 @@ class LoggingController: public ConnectionTracker
472 472 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
473 473 radioButton.SetPosition( DP(radioX), DP(radioY) );
474 474  
475   - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
  475 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
476 476  
477 477 frequencyRadioButtonsGroup.Add( radioButton );
478 478 mFrequencyRadioButtons[2] = radioButton;
... ... @@ -494,15 +494,15 @@ class LoggingController: public ConnectionTracker
494 494 {
495 495 Toolkit::PushButton button = Toolkit::PushButton::New();
496 496 button.SetName( VSYNC_BUTTON_ID );
497   - button.SetLabelText( VSYNC_BUTTON_TEXT );
  497 + button.SetLabel( VSYNC_BUTTON_TEXT );
498 498 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
499 499 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
500 500 button.SetPosition( buttonXDP, 0 );
501 501 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
502 502  
503   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  503 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
504 504 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
505   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  505 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
506 506  
507 507 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
508 508  
... ... @@ -543,15 +543,15 @@ class LoggingController: public ConnectionTracker
543 543 const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency;
544 544 if( frequency == HIGH_FREQUENCY )
545 545 {
546   - mFrequencyRadioButtons[0].SetActive( true );
  546 + mFrequencyRadioButtons[0].SetSelected( true );
547 547 }
548 548 else if( frequency == MEDIUM_FREQUENCY )
549 549 {
550   - mFrequencyRadioButtons[1].SetActive( true );
  550 + mFrequencyRadioButtons[1].SetSelected( true );
551 551 }
552 552 else if( frequency == LOW_FREQUENCY )
553 553 {
554   - mFrequencyRadioButtons[2].SetActive( true );
  554 + mFrequencyRadioButtons[2].SetSelected( true );
555 555 }
556 556 }
557 557  
... ...
examples/magnifier/magnifier-example.cpp
  View file @d59e156
... ... @@ -236,7 +236,6 @@ public:
236 236 mMagnifier.SetSourceActor( mView.GetBackgroundLayer() );
237 237 mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
238 238 mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
239   - mMagnifier.SetFrameVisibility(false);
240 239 mMagnifier.SetScale(Vector3::ZERO);
241 240 overlay.Add( mMagnifier );
242 241  
... ...
examples/shader-effect/refraction-effect-example.cpp
  View file @d59e156
... ... @@ -94,6 +94,7 @@ public:
94 94 static NoEffect New()
95 95 {
96 96 std::string vertexShader = MAKE_SHADER(
  97 + precision mediump float;\n
97 98 uniform mediump vec4 uTextureRect;\n
98 99 void main()\n
99 100 {\n
... ... @@ -102,6 +103,7 @@ public:
102 103 }\n
103 104 );
104 105 std::string fragmentShader = MAKE_SHADER(
  106 + precision mediump float;\n
105 107 void main()\n
106 108 {\n
107 109 gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n
... ... @@ -153,6 +155,7 @@ public:
153 155 static RefractionEffect New()
154 156 {
155 157 std::string vertexShader = MAKE_SHADER(
  158 + precision mediump float;\n
156 159 varying mediump vec2 vTextureOffset;\n
157 160 void main()\n
158 161 {\n
... ... @@ -167,6 +170,7 @@ public:
167 170 );
168 171  
169 172 std::string fragmentShader = MAKE_SHADER(
  173 + precision mediump float;\n
170 174 uniform mediump float uEffectStrength;\n
171 175 uniform mediump vec3 uLightPosition;\n
172 176 uniform mediump vec2 uLightXYOffset;\n
... ... @@ -205,7 +209,7 @@ public:
205 209 {\n
206 210 vec3 normal = normalize( vNormal);\n
207 211  
208   - vec3 lightPosition = uLightPosition + vec3(uLightXYOffset+uLightSpinOffset, 0.f);\n
  212 + vec3 lightPosition = uLightPosition + vec3(uLightXYOffset+uLightSpinOffset, 0.0);\n
209 213 mediump vec3 vecToLight = normalize( (lightPosition - vVertex.xyz) * 0.01 );\n
210 214 mediump float spotEffect = pow( max(0.05, vecToLight.z ) - 0.05, 8.0);\n
211 215  
... ...
packaging/com.samsung.dali-demo.spec
  View file @d59e156
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.0.26
  5 +Version: 1.0.28
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ... @@ -74,7 +74,7 @@ cp -f %{_builddir}/%{name}-%{version}/%{name}.xml %{buildroot}%{dali_xml_file_di
74 74 mkdir -p %{buildroot}%{dali_icon_dir}
75 75 mv %{buildroot}/%{dali_app_ro_dir}/images/%{name}.png %{buildroot}%{dali_icon_dir}
76 76  
77   -%if !%{with wayland}
  77 +%if 0%{?enable_dali_smack_rules} && !%{with wayland}
78 78 mkdir -p %{buildroot}%{smack_rule_dir}
79 79 cp -f %{_builddir}/%{name}-%{version}/%{name}.rule %{buildroot}%{smack_rule_dir}
80 80 %endif
... ... @@ -116,7 +116,7 @@ exit 0
116 116 %{dali_app_ro_dir}/scripts/*
117 117 %{dali_xml_file_dir}/%{name}.xml
118 118 %{dali_icon_dir}/*
119   -%if !%{with wayland}
  119 +%if 0%{?enable_dali_smack_rules} && !%{with wayland}
120 120 %config %{smack_rule_dir}/%{name}.rule
121 121 %endif
122 122 %{_datadir}/license/%{name}
... ...