From: Richard Underhill Date: Thu, 18 Jun 2015 14:11:22 +0000 (+0100) Subject: Removed DrawMode::OVERLAY from Toolkit components. X-Git-Tag: dali_1.0.47~13^2~12 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=72d72ebbbf093937bfb04108ce4dd491a458721b Removed DrawMode::OVERLAY from Toolkit components. Change-Id: I727cc5b486d7cea5cb4d9970c4d5447dbffb46f3 Signed-off-by: Richard Underhill --- diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index c0d52ca..2877ed3 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -1203,7 +1203,6 @@ void Button::OnInitialize() OnButtonInitialize(); - self.SetDrawMode( DrawMode::OVERLAY ); self.SetKeyboardFocusable( true ); } diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index 15de6ea..bfa4617 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -247,7 +247,6 @@ void Magnifier::SetFrameVisibility(bool visible) Image image = ResourceImage::New( DEFAULT_FRAME_IMAGE_PATH ); mFrame = ImageActor::New( image ); - mFrame.SetDrawMode(DrawMode::OVERLAY); mFrame.SetStyle( ImageActor::STYLE_NINE_PATCH ); mFrame.SetPositionInheritanceMode(DONT_INHERIT_POSITION); mFrame.SetInheritScale(true); diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index 7577220..df6a1b2 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -35,6 +35,7 @@ // INTERNAL INCLUDES #include #include +#include #include #include #include @@ -128,10 +129,10 @@ void Popup::OnInitialize() // Create Layer mLayer = Layer::New(); mLayer.SetName( "POPUP_LAYER" ); + mLayer.SetDepthTestDisabled( true ); mLayer.SetParentOrigin(ParentOrigin::CENTER); mLayer.SetAnchorPoint(AnchorPoint::CENTER); mLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - mLayer.SetDrawMode( DrawMode::OVERLAY ); // Any content after this point which is added to Self() will be reparented to // mContent. @@ -223,6 +224,11 @@ void Popup::SetBackgroundImage( Actor image ) mBackgroundImage.SetAnchorPoint( AnchorPoint::CENTER ); mBackgroundImage.SetParentOrigin( ParentOrigin::CENTER ); + if ( ImageActor imageActor = DownCast< ImageActor >( image ) ) + { + imageActor.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); + } + Vector3 border( mPopupStyle->backgroundOuterBorder.x, mPopupStyle->backgroundOuterBorder.z, 0.0f ); mBackgroundImage.SetSizeModeFactor( border ); @@ -243,6 +249,11 @@ void Popup::SetButtonAreaImage( Actor image ) // Adds new area image to the dialog. mButtonAreaImage = image; + if ( ImageActor imageActor = DownCast< ImageActor >( image ) ) + { + imageActor.SetDepthIndex( BACKGROUND_DEPTH_INDEX + 1 ); + } + // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. mButtonAreaImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); @@ -416,7 +427,7 @@ void Popup::CreateBacking() { mBacking = Dali::Toolkit::CreateSolidColorActor( mPopupStyle->backingColor ); mBacking.SetName( "POPUP_BACKING" ); - + mBacking.SetDepthIndex( BACKGROUND_DEPTH_INDEX - 1 ); mBacking.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mBacking.SetSensitive(true); diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp index f65e77e..e01dfbd 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -218,7 +218,6 @@ void ScrollBar::SetScrollIndicator( Actor indicator ) Actor self = Self(); self.Add(mIndicator); - self.SetDrawMode(DrawMode::OVERLAY); if( !mPanGestureDetector ) { diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index e56760f..bb13f59 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -1467,7 +1467,6 @@ void ItemView::EnableScrollOvershoot( bool enable ) mOvershootOverlay.SetColor(mOvershootEffectColor); mOvershootOverlay.SetParentOrigin(ParentOrigin::TOP_LEFT); mOvershootOverlay.SetAnchorPoint(AnchorPoint::TOP_LEFT); - mOvershootOverlay.SetDrawMode(DrawMode::OVERLAY); self.Add(mOvershootOverlay); Constraint constraint = Constraint::New( mOvershootOverlay, Actor::Property::SIZE, OvershootOverlaySizeConstraint ); diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp index 0d2e728..592fefc 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.cpp @@ -147,7 +147,6 @@ ScrollOvershootEffectRipple::ScrollOvershootEffectRipple( bool vertical, Scrolla mOvershootOverlay.SetColor(mAttachedScrollView.GetOvershootEffectColor()); mOvershootOverlay.SetParentOrigin(ParentOrigin::TOP_LEFT); mOvershootOverlay.SetAnchorPoint(AnchorPoint::TOP_LEFT); - mOvershootOverlay.SetDrawMode(DrawMode::OVERLAY); mOvershootOverlay.SetVisible(false); } diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index bffb5da..a9714d4 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -624,7 +624,6 @@ void ScrollView::OnInitialize() // Internal Actor, used to hide actors from enumerations. // Also actors added to Internal actor appear as overlays e.g. ScrollBar components. mInternalActor = Actor::New(); - mInternalActor.SetDrawMode(DrawMode::OVERLAY); self.Add(mInternalActor); mInternalActor.SetParentOrigin(ParentOrigin::CENTER); diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 8ff89c3..a7b105c 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -570,7 +570,6 @@ void Slider::CreateHandleValueDisplay() mHandleValueTextLabel.SetAnchorPoint( AnchorPoint::CENTER ); mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); - mHandleValueTextLabel.SetDrawMode( DrawMode::OVERLAY ); mHandle.Add( mHandleValueTextLabel ); } } diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index d66a70a..fac6ada 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -20,6 +20,7 @@ // INTERNAL INCLUDES #include +#include #include #include @@ -423,13 +424,11 @@ Dali::Image TextSelectionPopup::GetPopupImage( PopupParts part ) // Both containers will be added to a button. Toolkit::TableView optionContainer = Toolkit::TableView::New( (showIcons)?2:1 , 1 ); - optionContainer.SetDrawMode( DrawMode::OVERLAY ); optionContainer.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); optionContainer.SetMinimumSize( Vector2( OPTION_MIN_WIDTH, 0 ) ); optionContainer.SetFitWidth( 0 ); Toolkit::TableView optionPressedContainer = Toolkit::TableView::New( (showIcons)?2:1 , 1 ); - optionPressedContainer.SetDrawMode( DrawMode::OVERLAY ); optionPressedContainer.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); optionPressedContainer.SetMinimumSize( Vector2( OPTION_MIN_WIDTH, 0 ) ); optionPressedContainer.SetFitWidth( 0 ); @@ -464,6 +463,8 @@ Dali::Image TextSelectionPopup::GetPopupImage( PopupParts part ) // 3. Create the icons ImageActor pressedIcon = ImageActor::New( iconImage ); ImageActor icon = ImageActor::New( iconImage ); + icon.SetDepthIndex( DECORATION_DEPTH_INDEX - 1 ); + pressedIcon.SetDepthIndex( DECORATION_DEPTH_INDEX - 1 ); icon.SetName("image-icon-2014"); icon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); pressedIcon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index 245e581..5f19660 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -41,6 +41,7 @@ // INTERNAL INCLUDES #include +#include #include #include #include @@ -390,6 +391,7 @@ struct Decorator::Impl : public ConnectionTracker void CreateCursor( ImageActor& cursor, const Vector4& color ) { cursor = CreateSolidColorActor( color ); + cursor.SetDepthIndex( DECORATION_DEPTH_INDEX ); cursor.SetParentOrigin( ParentOrigin::TOP_LEFT ); // Need to set the default parent origin as CreateSolidColorActor() sets a different one. cursor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); } @@ -507,8 +509,8 @@ struct Decorator::Impl : public ConnectionTracker } grabHandle.actor = ImageActor::New( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] ); + grabHandle.actor.SetDepthIndex( DECORATION_DEPTH_INDEX ); grabHandle.actor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); - grabHandle.actor.SetDrawMode( DrawMode::OVERLAY ); // Area that Grab handle responds to, larger than actual handle so easier to move #ifdef DECORATOR_DEBUG grabHandle.actor.SetName( "GrabHandleActor" ); @@ -555,7 +557,7 @@ struct Decorator::Impl : public ConnectionTracker primary.actor.SetName("SelectionHandleOne"); #endif primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text. - primary.actor.SetDrawMode( DrawMode::OVERLAY ); // ensure grab handle above text + primary.actor.SetDepthIndex( DECORATION_DEPTH_INDEX ); primary.flipped = false; primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move @@ -587,7 +589,7 @@ struct Decorator::Impl : public ConnectionTracker secondary.actor.SetName("SelectionHandleTwo"); #endif secondary.actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text. - secondary.actor.SetDrawMode( DrawMode::OVERLAY ); // ensure grab handle above text + secondary.actor.SetDepthIndex( DECORATION_DEPTH_INDEX ); secondary.flipped = false; secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp index b1724d0..75d2541 100644 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -25,12 +25,8 @@ // INTERNAL INCLUDES -#include -#include +#include #include -#include -#include -//#include using namespace Dali; using namespace Dali::Toolkit; @@ -377,7 +373,6 @@ struct AtlasRenderer::Impl : public ConnectionTracker Material material = mGlyphManager.GetMaterial( meshRecord.mAtlasId ); Dali::Renderer renderer = Dali::Renderer::New( quadGeometry, material ); - renderer.SetDepthIndex( 0 ); Actor actor = Actor::New(); actor.AddRenderer( renderer ); actor.SetSize( 1.0f, 1.0f ); @@ -667,7 +662,9 @@ struct AtlasRenderer::Impl : public ConnectionTracker material.AddSampler( sampler ); Dali::Renderer renderer = Dali::Renderer::New( quadGeometry, material ); - renderer.SetDepthIndex( -1 ); + + // Ensure shadow is behind the text... + renderer.SetDepthIndex( CONTENT_DEPTH_INDEX - 1 ); Actor actor = Actor::New(); actor.AddRenderer( renderer ); actor.SetSize( 1.0f, 1.0f );