Peter M. Groen / dali-demo

Commit ea31892198fa97feb48783123a5cf5214be368bd

Authored by Xiangyin Ma
2 parents ec03763c cdc2b603

[dali_1.0.28] Merge branch 'tizen' 

Change-Id: I39213b0d1cc0b4d2d95d57ae8eee74e1a6242594
Inline Side-by-side
Showing 5 changed files with 71 additions and 65 deletions
demo/dali-table-view.cpp
  View file @ea31892
... ... @@ -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
... ... @@ -290,11 +290,13 @@ void DaliTableView::Initialize( Application&amp; application )
290 290  
291 291 // Add logo
292 292 mLogo = CreateLogo( LOGO_PATH );
293   - const float logoHeight = mLogo.GetImage().GetHeight() + DP(LOGO_MARGIN);
  293 + const float paddingHeight = ( ( 1.f-TABLE_RELATIVE_SIZE.y ) * stageSize.y );
  294 + const float logoMargin = paddingHeight * LOGO_MARGIN_RATIO;
  295 + const float logoHeight = mLogo.GetImage().GetHeight() + logoMargin;
294 296 mRootActor.SetFixedHeight( 1, logoHeight );
295 297  
296   - mButtonsPageRelativeSize = Vector3( TABLE_RELATIVE_SIZE.x, ( stageSize.height - toolbarHeight - logoHeight - DP( BOTTOM_PADDING_HEIGHT ) ) / stageSize.height, TABLE_RELATIVE_SIZE.z );
297   -
  298 + const float bottomMargin = paddingHeight * BOTTOM_PADDING_RATIO;
  299 + mButtonsPageRelativeSize = Vector3( TABLE_RELATIVE_SIZE.x, 1.f - ( toolbarHeight + logoHeight + bottomMargin) / stageSize.height, TABLE_RELATIVE_SIZE.z );
298 300 mRootActor.SetFixedHeight( 2, mButtonsPageRelativeSize.y * stageSize.height );
299 301  
300 302 Alignment alignment = Alignment::New();
... ...
examples/buttons/buttons-example.cpp
  View file @ea31892
... ... @@ -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 );
... ... @@ -249,9 +249,9 @@ class ButtonsController: public ConnectionTracker
249 249 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
250 250 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
251 251 radioButton.SetPosition( 0, 0 );
252   - radioButton.SetActive( true );
  252 + radioButton.SetSelected( true );
253 253  
254   - radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
  254 + radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
255 255  
256 256 radioButtonsGroup1.Add( radioButton );
257 257 }
... ... @@ -264,7 +264,7 @@ class ButtonsController: public ConnectionTracker
264 264 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
265 265 radioButton.SetPosition( 0, DP(50) );
266 266  
267   - radioButton.ToggledSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
  267 + radioButton.StateChangedSignal().Connect( this, &ButtonsController::EnableSelectButtonToggle );
268 268  
269 269 radioButtonsGroup1.Add( radioButton );
270 270 }
... ... @@ -293,7 +293,7 @@ class ButtonsController: public ConnectionTracker
293 293 checkBox.SetBackgroundImage( unchecked );
294 294 checkBox.SetCheckedImage( checked );
295 295 checkBox.SetSize( DP(48), DP(48) );
296   - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
  296 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
297 297  
298 298 checkBoxBackground.Add( checkBox );
299 299 }
... ... @@ -316,7 +316,7 @@ class ButtonsController: public ConnectionTracker
316 316 checkBox.SetCheckedImage( checked );
317 317 checkBox.SetSize( DP(48), DP(48) );
318 318 checkBox.SetChecked( true );
319   - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
  319 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
320 320  
321 321 checkBoxBackground.Add( checkBox );
322 322 }
... ... @@ -338,7 +338,7 @@ class ButtonsController: public ConnectionTracker
338 338 checkBox.SetBackgroundImage( unchecked );
339 339 checkBox.SetCheckedImage( checked );
340 340 checkBox.SetSize( DP(48), DP(48) );
341   - checkBox.ToggledSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
  341 + checkBox.StateChangedSignal().Connect( this, &ButtonsController::OnCheckBoxesToggled );
342 342  
343 343 checkBoxBackground.Add( checkBox );
344 344 }
... ... @@ -365,14 +365,14 @@ class ButtonsController: public ConnectionTracker
365 365 toggleButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
366 366 toggleButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
367 367 toggleButton.SetPosition( DP(MARGIN_SIZE), DP(MARGIN_SIZE) );
368   - toggleButton.SetLabelText( "Toggle OFF" );
  368 + toggleButton.SetLabel( "Toggle OFF" );
369 369 toggleButton.SetSize( DP(150), DP(BUTTON_HEIGHT) );
370 370  
371   - toggleButton.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
372   - toggleButton.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  371 + toggleButton.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  372 + toggleButton.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
373 373 toggleButton.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
374 374  
375   - toggleButton.ToggledSignal().Connect( this, &ButtonsController::OnButtonToggled );
  375 + toggleButton.StateChangedSignal().Connect( this, &ButtonsController::OnButtonToggled );
376 376  
377 377 toggleBackground.Add( toggleButton );
378 378 }
... ... @@ -396,11 +396,11 @@ class ButtonsController: public ConnectionTracker
396 396 {
397 397 if( state )
398 398 {
399   - pushButton.SetLabelText( "Toggle ON" );
  399 + pushButton.SetLabel( "Toggle ON" );
400 400 }
401 401 else
402 402 {
403   - pushButton.SetLabelText( "Toggle OFF" );
  403 + pushButton.SetLabel( "Toggle OFF" );
404 404 }
405 405 }
406 406  
... ... @@ -411,11 +411,11 @@ class ButtonsController: public ConnectionTracker
411 411 {
412 412 if( button.GetName() == "radio-select-enable" && state == true )
413 413 {
414   - mUpdateButton.SetDimmed( false );
  414 + mUpdateButton.SetDisabled( false );
415 415 }
416 416 else if( button.GetName() == "radio-select-disable" && state == true )
417 417 {
418   - mUpdateButton.SetDimmed( true );
  418 + mUpdateButton.SetDisabled( true );
419 419 }
420 420  
421 421 return true;
... ... @@ -423,15 +423,15 @@ class ButtonsController: public ConnectionTracker
423 423  
424 424 bool OnButtonClicked(Toolkit::Button button)
425 425 {
426   - if( mRadioButtonImage1.IsActive() )
  426 + if( mRadioButtonImage1.IsSelected() )
427 427 {
428 428 mImage.SetImage( mBigImage1 );
429 429 }
430   - else if( mRadioButtonImage2.IsActive() )
  430 + else if( mRadioButtonImage2.IsSelected() )
431 431 {
432 432 mImage.SetImage( mBigImage2 );
433 433 }
434   - else if( mRadioButtonImage3.IsActive() )
  434 + else if( mRadioButtonImage3.IsSelected() )
435 435 {
436 436 mImage.SetImage( mBigImage3 );
437 437 }
... ...
examples/logging/logging-example.cpp
  View file @ea31892
... ... @@ -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";
... ... @@ -224,9 +224,9 @@ class LoggingController: public ConnectionTracker
224 224 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
225 225 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
226 226 radioButton.SetPosition( DP(radioX), DP(radioY) );
227   - radioButton.SetActive( true );
  227 + radioButton.SetSelected( true );
228 228  
229   - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
  229 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
230 230  
231 231 radioButtonsGroup.Add( radioButton );
232 232 mLogRadioButtons[0] = radioButton;
... ... @@ -242,7 +242,7 @@ class LoggingController: public ConnectionTracker
242 242 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
243 243 radioButton.SetPosition( DP(radioX), DP(radioY) );
244 244  
245   - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
  245 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
246 246  
247 247 radioButtonsGroup.Add( radioButton );
248 248 mLogRadioButtons[1] = radioButton;
... ... @@ -258,7 +258,7 @@ class LoggingController: public ConnectionTracker
258 258 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
259 259 radioButton.SetPosition( DP(radioX), DP(radioY) );
260 260  
261   - radioButton.ToggledSignal().Connect( this, &LoggingController::LoggingRadioSelect );
  261 + radioButton.StateChangedSignal().Connect( this, &LoggingController::LoggingRadioSelect );
262 262  
263 263 radioButtonsGroup.Add( radioButton );
264 264 mLogRadioButtons[2] = radioButton;
... ... @@ -280,15 +280,15 @@ class LoggingController: public ConnectionTracker
280 280 {
281 281 Toolkit::PushButton button = Toolkit::PushButton::New();
282 282 button.SetName( CREATE_BUTTON_ID );
283   - button.SetLabelText( CREATE_BUTTON_TEXT );
  283 + button.SetLabel( CREATE_BUTTON_TEXT );
284 284 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
285 285 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
286 286 button.SetPosition( buttonXDP, 0 );
287 287 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
288 288  
289   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  289 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
290 290 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
291   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  291 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
292 292  
293 293 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
294 294  
... ... @@ -300,15 +300,15 @@ class LoggingController: public ConnectionTracker
300 300  
301 301 Toolkit::PushButton button = Toolkit::PushButton::New();
302 302 button.SetName( DELETE_BUTTON_ID );
303   - button.SetLabelText( DELETE_BUTTON_TEXT );
  303 + button.SetLabel( DELETE_BUTTON_TEXT );
304 304 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
305 305 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
306 306 button.SetPosition( buttonXDP, 0 );
307 307 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
308 308  
309   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  309 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
310 310 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
311   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  311 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
312 312  
313 313 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
314 314  
... ... @@ -331,15 +331,15 @@ class LoggingController: public ConnectionTracker
331 331 {
332 332 Toolkit::PushButton button = Toolkit::PushButton::New();
333 333 button.SetName( START_BUTTON_ID );
334   - button.SetLabelText( START_BUTTON_TEXT );
  334 + button.SetLabel( START_BUTTON_TEXT );
335 335 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
336 336 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
337 337 button.SetPosition( buttonXDP, 0 );
338 338 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
339 339  
340   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  340 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
341 341 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
342   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  342 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
343 343  
344 344 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
345 345  
... ... @@ -351,15 +351,15 @@ class LoggingController: public ConnectionTracker
351 351  
352 352 Toolkit::PushButton button = Toolkit::PushButton::New();
353 353 button.SetName( STOP_BUTTON_ID );
354   - button.SetLabelText( STOP_BUTTON_TEXT );
  354 + button.SetLabel( STOP_BUTTON_TEXT );
355 355 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
356 356 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
357 357 button.SetPosition( buttonXDP, 0 );
358 358 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
359 359  
360   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  360 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
361 361 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
362   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  362 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
363 363  
364 364 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
365 365  
... ... @@ -382,15 +382,15 @@ class LoggingController: public ConnectionTracker
382 382 {
383 383 Toolkit::PushButton button = Toolkit::PushButton::New();
384 384 button.SetName( ENABLE_BUTTON_ID );
385   - button.SetLabelText( ENABLE_BUTTON_TEXT );
  385 + button.SetLabel( ENABLE_BUTTON_TEXT );
386 386 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
387 387 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
388 388 button.SetPosition( buttonXDP, 0 );
389 389 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
390 390  
391   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  391 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
392 392 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
393   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  393 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
394 394  
395 395 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
396 396  
... ... @@ -402,15 +402,15 @@ class LoggingController: public ConnectionTracker
402 402  
403 403 Toolkit::PushButton button = Toolkit::PushButton::New();
404 404 button.SetName( DISABLE_BUTTON_ID );
405   - button.SetLabelText( DISABLE_BUTTON_TEXT );
  405 + button.SetLabel( DISABLE_BUTTON_TEXT );
406 406 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
407 407 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
408 408 button.SetPosition( buttonXDP, 0 );
409 409 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
410 410  
411   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  411 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
412 412 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
413   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  413 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
414 414  
415 415 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
416 416  
... ... @@ -459,7 +459,7 @@ class LoggingController: public ConnectionTracker
459 459 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
460 460 radioButton.SetPosition( DP(radioX), DP(radioY) );
461 461  
462   - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
  462 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
463 463  
464 464 frequencyRadioButtonsGroup.Add( radioButton );
465 465 mFrequencyRadioButtons[0] = radioButton;
... ... @@ -474,9 +474,9 @@ class LoggingController: public ConnectionTracker
474 474 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
475 475 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
476 476 radioButton.SetPosition( DP(radioX), DP(radioY) );
477   - radioButton.SetActive( true );
  477 + radioButton.SetSelected( true );
478 478  
479   - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
  479 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
480 480  
481 481 frequencyRadioButtonsGroup.Add( radioButton );
482 482 mFrequencyRadioButtons[1] = radioButton;
... ... @@ -492,7 +492,7 @@ class LoggingController: public ConnectionTracker
492 492 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
493 493 radioButton.SetPosition( DP(radioX), DP(radioY) );
494 494  
495   - radioButton.ToggledSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
  495 + radioButton.StateChangedSignal().Connect( this, &LoggingController::FrequencyRadioSelect );
496 496  
497 497 frequencyRadioButtonsGroup.Add( radioButton );
498 498 mFrequencyRadioButtons[2] = radioButton;
... ... @@ -514,15 +514,15 @@ class LoggingController: public ConnectionTracker
514 514 {
515 515 Toolkit::PushButton button = Toolkit::PushButton::New();
516 516 button.SetName( VSYNC_BUTTON_ID );
517   - button.SetLabelText( VSYNC_BUTTON_TEXT );
  517 + button.SetLabel( VSYNC_BUTTON_TEXT );
518 518 button.SetParentOrigin( ParentOrigin::CENTER_LEFT );
519 519 button.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
520 520 button.SetPosition( buttonXDP, 0 );
521 521 button.SetSize( buttonWidthDP, DP(BUTTON_HEIGHT) );
522 522  
523   - button.SetPressedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
  523 + button.SetSelectedImage( Dali::Image::New( PUSHBUTTON_PRESS_IMAGE ) );
524 524 button.SetButtonImage( Dali::Image::New( PUSHBUTTON_BUTTON_IMAGE ) );
525   - button.SetDimmedImage( Dali::Image::New( PUSHBUTTON_DIM_IMAGE ) );
  525 + button.SetDisabledImage( Dali::Image::New( PUSHBUTTON_DISABLED_IMAGE ) );
526 526  
527 527 button.ClickedSignal().Connect( this, &LoggingController::OnButtonClicked );
528 528  
... ... @@ -580,15 +580,15 @@ class LoggingController: public ConnectionTracker
580 580 const unsigned int frequency = mLoggerStates[mCurrentLogger].frequency;
581 581 if( frequency == HIGH_FREQUENCY )
582 582 {
583   - mFrequencyRadioButtons[0].SetActive( true );
  583 + mFrequencyRadioButtons[0].SetSelected( true );
584 584 }
585 585 else if( frequency == MEDIUM_FREQUENCY )
586 586 {
587   - mFrequencyRadioButtons[1].SetActive( true );
  587 + mFrequencyRadioButtons[1].SetSelected( true );
588 588 }
589 589 else if( frequency == LOW_FREQUENCY )
590 590 {
591   - mFrequencyRadioButtons[2].SetActive( true );
  591 + mFrequencyRadioButtons[2].SetSelected( true );
592 592 }
593 593 }
594 594  
... ...
examples/shader-effect/refraction-effect-example.cpp
  View file @ea31892
... ... @@ -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 @ea31892
... ... @@ -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.27
  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}
... ...