From 7f0220a3fbe3d8354e455b7f1faa2fe9d8fdab4f Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Thu, 8 Dec 2016 15:35:04 +0000 Subject: [PATCH] Imageview svg demo to have offset from top of screen Styling demo style sheet updates Change-Id: Id5addc0be74c387b66b9db1132b4429c6a8af4ed --- examples/image-view-svg/image-view-svg-example.cpp | 1 + resources/style/style-example-theme-two.json.in | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp index 97ebeba..859933c 100644 --- a/examples/image-view-svg/image-view-svg-example.cpp +++ b/examples/image-view-svg/image-view-svg-example.cpp @@ -100,6 +100,7 @@ public: { mSvgActor[i] = Toolkit::ImageView::New(SVG_IMAGES[mIndex+i]); mSvgActor[i].SetSize( mActorSize ); + mSvgActor[i].TranslateBy( Vector3( 0.0, stageSize.height * 0.05, 0.0f ) ); stage.Add( mSvgActor[i] ); } mSvgActor[0].SetParentOrigin( ParentOrigin::CENTER ); diff --git a/resources/style/style-example-theme-two.json.in b/resources/style/style-example-theme-two.json.in index f5b194d..d6e257b 100644 --- a/resources/style/style-example-theme-two.json.in +++ b/resources/style/style-example-theme-two.json.in @@ -25,10 +25,16 @@ // Change an icon size, see if it gets properly re-sized "RadioButton":{ - "unselectedStateImage":"{STYLE_DIR}/images/radio-button-unselected.png", - "selectedStateImage":"{STYLE_DIR}/images/radio-button-selected.png", - "disabledStateImage":"{STYLE_DIR}/images/radio-button-unselected-disabled.png", - "imageLabelGap":10, + "unselectedVisual": + { + "visualType": "IMAGE", + "url": "{STYLE_DIR}/images/radio-button-unselected.png" + }, + "selectedVisual": + { + "visualType": "IMAGE", + "url": "{STYLE_DIR}/images/radio-button-selected.png" + }, "label":{ "textColor": [0.1,1,1,1] } -- 2.7.4