Peter M. Groen / dali-demo

Commit 44e6186793816009ff6d1cbb51114218f6bec7f9

Authored by Richard Huang
2 parents 136309f9 41d5d99a

[dali_1.1.11] Merge branch 'devel/master' 

Change-Id: I0b46b3d93eb35506f70be536ed5de59f887c3295
Inline Side-by-side
Showing 5 changed files with 15 additions and 19 deletions
demo/dali-table-view.cpp
  View file @44e6186
@@ -465,7 +465,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit @@ -465,7 +465,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
465 content.Add( image ); 465 content.Add( image );
466 466
467 // Add stencil 467 // Add stencil
468 - ImageActor stencil = NewStencilImage(); 468 + Toolkit::ImageView stencil = NewStencilImage();
469 stencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); 469 stencil.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
470 image.Add( stencil ); 470 image.Add( stencil );
471 } 471 }
@@ -490,20 +490,18 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit @@ -490,20 +490,18 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit
490 return content; 490 return content;
491 } 491 }
492 492
493 -ImageActor DaliTableView::NewStencilImage() 493 +Toolkit::ImageView DaliTableView::NewStencilImage()
494 { 494 {
495 - Image alpha = ResourceImage::New( TILE_BACKGROUND_ALPHA ); 495 + Toolkit::ImageView stencil = ImageView::New( TILE_BACKGROUND_ALPHA );
496 496
497 - ImageActor stencilActor = ImageActor::New( alpha ); 497 + stencil.SetParentOrigin( ParentOrigin::CENTER );
  498 + stencil.SetAnchorPoint( AnchorPoint::CENTER );
  499 + stencil.SetDrawMode( DrawMode::STENCIL );
498 500
499 - stencilActor.SetParentOrigin( ParentOrigin::CENTER );  
500 - stencilActor.SetAnchorPoint( AnchorPoint::CENTER );  
501 - stencilActor.SetDrawMode( DrawMode::STENCIL ); 501 + Property::Map shaderEffect = CreateAlphaDiscardEffect();
  502 + stencil.SetProperty( Toolkit::ImageView::Property::IMAGE, shaderEffect );
502 503
503 - Dali::ShaderEffect shaderEffect = CreateAlphaDiscardEffect();  
504 - stencilActor.SetShaderEffect( shaderEffect );  
505 -  
506 - return stencilActor; 504 + return stencil;
507 } 505 }
508 506
509 bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event ) 507 bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
demo/dali-table-view.h
  View file @44e6186
@@ -151,7 +151,7 @@ private: // Application callbacks & implementation @@ -151,7 +151,7 @@ private: // Application callbacks & implementation
151 * 151 *
152 * @return The stencil image 152 * @return The stencil image
153 */ 153 */
154 - Dali::ImageActor NewStencilImage(); 154 + Dali::Toolkit::ImageView NewStencilImage();
155 155
156 // Signal handlers 156 // Signal handlers
157 157
packaging/com.samsung.dali-demo.spec
  View file @44e6186
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.1.10 5 +Version: 1.1.11
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
resources/images/item-background-alpha.9.png
View file @44e6186

385 Bytes | W: | H:

254 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/scripts/slider.json
  View file @44e6186
@@ -89,13 +89,11 @@ @@ -89,13 +89,11 @@
89 "valuePrescision": 0, 89 "valuePrescision": 0,
90 "value": 100.0, 90 "value": 100.0,
91 "hitRegion": [0, 48], 91 "hitRegion": [0, 48],
92 - "backingRegion": [0, 10], 92 + "backingRegion": [0, 30],
93 "handleRegion": [48, 48], 93 "handleRegion": [48, 48],
94 - "backingImageName": "{DALI_IMAGE_DIR}circle_point_32x32.png",  
95 - "handleImageName": "{DALI_IMAGE_DIR}circle_point_shadow_32x32.png",  
96 - "progressImageName": "{DALI_IMAGE_DIR}circle_point.png",  
97 - "backingScale9Border": [16, 0, 16, 0],  
98 - "progressScale9Border": [16, 0, 16, 0] 94 + "backingImageName": "{DALI_IMAGE_DIR}button-up-14.9.png",
  95 + "handleImageName": "{DALI_IMAGE_DIR}blocks-ball.png",
  96 + "progressImageName": "{DALI_IMAGE_DIR}button-down.9.png"
99 }, { 97 }, {
100 "type": "Slider", 98 "type": "Slider",
101 "parentOrigin": "TOP_CENTER", 99 "parentOrigin": "TOP_CENTER",