From 6e6a798bc1f40041fc2f6ba09c6ed583773eb1ac Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Fri, 29 May 2015 10:56:24 +0100 Subject: [PATCH] Stop using Z-position hacks in text-label.example (also stop hiding the text with mGrabCorner) Change-Id: I74c91714615e44384c1baadfc74621bd9f11c4f9 --- examples/text-label/text-label-example.cpp | 10 +++++----- resources/images/grab-handle.png | Bin 0 -> 5136 bytes 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 resources/images/grab-handle.png diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index 12192906..9d12f7d9 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -34,7 +34,7 @@ using namespace MultiLanguageStrings; namespace { - const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "button-up.9.png"; + const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "grab-handle.png"; const unsigned int KEY_ZERO = 10; const unsigned int KEY_ONE = 11; @@ -107,16 +107,16 @@ public: mContainer.SetParentOrigin( ParentOrigin::CENTER ); mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f); mContainer.SetSize( mLayoutSize ); + mContainer.SetDrawMode( DrawMode::OVERLAY ); stage.Add( mContainer ); // Resize the center layout when the corner is grabbed mGrabCorner = Control::New(); mGrabCorner.SetName( "GrabCorner" ); - mGrabCorner.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT ); + mGrabCorner.SetAnchorPoint( AnchorPoint::TOP_CENTER ); mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT ); - mGrabCorner.SetSize( Vector2(stageSize.width*0.1f, stageSize.width*0.1f) ); - mGrabCorner.SetZ(1.0f); - mGrabCorner.SetBackgroundColor( Color::YELLOW ); + mGrabCorner.SetBackgroundImage( ResourceImage::New( BACKGROUND_IMAGE ) ); + mGrabCorner.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); mContainer.Add( mGrabCorner ); mPanGestureDetector = PanGestureDetector::New(); diff --git a/resources/images/grab-handle.png b/resources/images/grab-handle.png new file mode 100644 index 0000000000000000000000000000000000000000..61ab8529bca54c499ab318067aa4ef730f1559fb GIT binary patch literal 5136 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