Commit 2952b5c8a401751c0b12a169ac84aeaa56cf9e53
[dali_1.3.15] Merge branch 'devel/master'
Change-Id: I0665f9278e4f116fc4a286970daf1f5e97ba5869
Showing
3 changed files
with
7 additions
and
7 deletions
examples/primitive-shapes/primitive-shapes-example.cpp
| ... | ... | @@ -28,7 +28,7 @@ namespace |
| 28 | 28 | { |
| 29 | 29 | DEMO_IMAGE_DIR "sphere-button.png", |
| 30 | 30 | DEMO_IMAGE_DIR "cone-button.png", |
| 31 | - DEMO_IMAGE_DIR "conical-frustrum-button.png", | |
| 31 | + DEMO_IMAGE_DIR "conical-frustum-button.png", | |
| 32 | 32 | DEMO_IMAGE_DIR "cylinder-button.png", |
| 33 | 33 | DEMO_IMAGE_DIR "cube-button.png", |
| 34 | 34 | DEMO_IMAGE_DIR "bevelled-cube-button.png", |
| ... | ... | @@ -413,13 +413,13 @@ public: |
| 413 | 413 | mShapeTitle.SetProperty( TextLabel::Property::TEXT, SHAPE_TITLE_PREFIX + "Cone" ); |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - //Sets the 3D model to a conical frustrum and modifies the sliders appropriately. | |
| 417 | - void LoadConicalFrustrum() | |
| 416 | + //Sets the 3D model to a conical frustum and modifies the sliders appropriately. | |
| 417 | + void LoadConicalFrustum() | |
| 418 | 418 | { |
| 419 | 419 | InitialiseSlidersAndModel(); |
| 420 | 420 | |
| 421 | 421 | //Set up specific visual properties. |
| 422 | - mVisualMap[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::CONICAL_FRUSTRUM; | |
| 422 | + mVisualMap[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::CONICAL_FRUSTUM; | |
| 423 | 423 | mVisualMap[ PrimitiveVisual::Property::SCALE_TOP_RADIUS ] = DEFAULT_SCALE_TOP_RADIUS; |
| 424 | 424 | mVisualMap[ PrimitiveVisual::Property::SCALE_BOTTOM_RADIUS ] = DEFAULT_SCALE_BOTTOM_RADIUS; |
| 425 | 425 | mVisualMap[ PrimitiveVisual::Property::SCALE_HEIGHT ] = DEFAULT_SCALE_HEIGHT; |
| ... | ... | @@ -439,7 +439,7 @@ public: |
| 439 | 439 | mModel.SetProperty( Control::Property::BACKGROUND, Property::Value( mVisualMap ) ); |
| 440 | 440 | |
| 441 | 441 | //Update title. |
| 442 | - mShapeTitle.SetProperty( TextLabel::Property::TEXT, SHAPE_TITLE_PREFIX + "Conical Frustrum" ); | |
| 442 | + mShapeTitle.SetProperty( TextLabel::Property::TEXT, SHAPE_TITLE_PREFIX + "Conical Frustum" ); | |
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | //Sets the 3D model to a cylinder and modifies the sliders appropriately. |
| ... | ... | @@ -589,7 +589,7 @@ public: |
| 589 | 589 | } |
| 590 | 590 | case 2: |
| 591 | 591 | { |
| 592 | - LoadConicalFrustrum(); | |
| 592 | + LoadConicalFrustum(); | |
| 593 | 593 | break; |
| 594 | 594 | } |
| 595 | 595 | case 3: | ... | ... |
packaging/com.samsung.dali-demo.spec
resources/images/conical-frustrum-button.png renamed to resources/images/conical-frustum-button.png
3.81 KB