From: Kimmo Hoikka Date: Tue, 14 Apr 2015 10:52:41 +0000 (-0700) Subject: Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen X-Git-Tag: dali_1.0.38~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=935e800159c04fa5d389628add6183eb68f778ee;hp=-c Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen --- 935e800159c04fa5d389628add6183eb68f778ee diff --combined dali-toolkit/internal/controls/buttons/button-impl.cpp index 4765f44,c42531f..d1f30bc --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@@ -19,7 -19,6 +19,7 @@@ #include "button-impl.h" // EXTERNAL INCLUDES +#include // for strcmp #include #include #include @@@ -617,11 -616,6 +617,6 @@@ float Button::GetAnimationTime() cons void Button::SetLabel( const std::string& label ) { Toolkit::TextLabel textLabel = Toolkit::TextLabel::New( label ); - textLabel.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); - textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); - textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); - SetLabel( textLabel ); } diff --combined dali-toolkit/internal/controls/popup/popup-impl.cpp index 42fac71,8a1c679..a5aed9b --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@@ -19,7 -19,6 +19,7 @@@ #include // EXTERNAL INCLUDES +#include // for strcmp #include #include #include @@@ -122,14 -121,14 +122,14 @@@ void Popup::OnInitialize( Actor self = Self(); self.SetSensitive(false); // Reisize to fit the height of children - self.SetResizePolicy( FIT_TO_CHILDREN, HEIGHT ); + self.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT ); // Create Layer mLayer = Layer::New(); mLayer.SetName( "POPUP_LAYER" ); mLayer.SetParentOrigin(ParentOrigin::CENTER); mLayer.SetAnchorPoint(AnchorPoint::CENTER); - mLayer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + 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 @@@ -148,8 -147,8 +148,8 @@@ mPopupLayout.SetName( "POPUP_LAYOUT_TABLE" ); mPopupLayout.SetParentOrigin(ParentOrigin::CENTER); mPopupLayout.SetAnchorPoint(AnchorPoint::CENTER); - mPopupLayout.SetResizePolicy( FILL_TO_PARENT, WIDTH ); - mPopupLayout.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT ); + mPopupLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); mPopupLayout.SetFitHeight( 0 ); // Set row to fit mPopupLayout.SetFitHeight( 1 ); // Set row to fit self.Add( mPopupLayout ); @@@ -224,7 -223,7 +224,7 @@@ void Popup::SetBackgroundImage( Actor i // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. mBackgroundImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); - mBackgroundImage.SetResizePolicy( SIZE_FIXED_OFFSET_FROM_PARENT, ALL_DIMENSIONS ); + mBackgroundImage.SetResizePolicy( ResizePolicy::SIZE_FIXED_OFFSET_FROM_PARENT, Dimension::ALL_DIMENSIONS ); mBackgroundImage.SetAnchorPoint( AnchorPoint::CENTER ); mBackgroundImage.SetParentOrigin( ParentOrigin::CENTER ); @@@ -251,7 -250,7 +251,7 @@@ void Popup::SetButtonAreaImage( Actor i // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. mButtonAreaImage.TouchedSignal().Connect( this, &Popup::OnDialogTouched ); - mButtonAreaImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mButtonAreaImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mButtonAreaImage.SetAnchorPoint( AnchorPoint::CENTER ); mButtonAreaImage.SetParentOrigin( ParentOrigin::CENTER ); @@@ -277,8 -276,8 +277,8 @@@ void Popup::SetTitle( const std::string if( mPopupLayout ) { mTitle.SetPadding( Padding( 0.0f, 0.0f, mPopupStyle->margin, mPopupStyle->margin ) ); - mTitle.SetResizePolicy( FILL_TO_PARENT, WIDTH ); - mTitle.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); + mTitle.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + mTitle.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); mPopupLayout.AddChild( mTitle, Toolkit::TableView::CellPosition( 0, 0 ) ); } @@@ -303,7 -302,7 +303,7 @@@ void Popup::CreateFooter( mBottomBg = Actor::New(); mBottomBg.SetName( "POPUP_BOTTOM_BG" ); mBottomBg.SetRelayoutEnabled( true ); - mBottomBg.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mBottomBg.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mPopupLayout.SetFixedHeight( 2, mPopupStyle->bottomSize.height ); // Buttons mPopupLayout.AddChild( mBottomBg, Toolkit::TableView::CellPosition( 2, 0 ) ); @@@ -313,7 -312,7 +313,7 @@@ void Popup::AddButton( Toolkit::Button button ) { mButtons.push_back( button ); - button.SetResizePolicy( USE_ASSIGNED_SIZE, ALL_DIMENSIONS ); // Size will be assigned to it + button.SetResizePolicy( ResizePolicy::USE_ASSIGNED_SIZE, Dimension::ALL_DIMENSIONS ); // Size will be assigned to it // If this is the first button added if( mButtons.size() == 1 ) @@@ -423,7 -422,7 +423,7 @@@ void Popup::CreateBacking( mBacking = Dali::Toolkit::CreateSolidColorActor( mPopupStyle->backingColor ); mBacking.SetName( "POPUP_BACKING" ); - mBacking.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mBacking.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mBacking.SetSensitive(true); mLayer.Add( mBacking ); @@@ -688,23 -687,23 +688,23 @@@ void Popup::OnRelayout( const Vector2& } } - void Popup::OnSetResizePolicy( ResizePolicy policy, Dimension dimension ) + void Popup::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { if( mPopupLayout ) { - if( policy == FIT_TO_CHILDREN ) + if( policy == ResizePolicy::FIT_TO_CHILDREN ) { - mPopupLayout.SetResizePolicy( USE_NATURAL_SIZE, dimension ); - if( dimension & HEIGHT ) + mPopupLayout.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, dimension ); + if( dimension & Dimension::HEIGHT ) { mPopupLayout.SetFitHeight( 1 ); } } else { - mPopupLayout.SetResizePolicy( FILL_TO_PARENT, dimension ); + mPopupLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, dimension ); // Make the content cell fill the whole of the available space - if( dimension & HEIGHT ) + if( dimension & Dimension::HEIGHT ) { mPopupLayout.SetRelativeHeight( 1, 1.0f ); } diff --combined dali-toolkit/internal/controls/view/view-impl.cpp index 3b2ff0b,9a5ac2e..19dd781 --- a/dali-toolkit/internal/controls/view/view-impl.cpp +++ b/dali-toolkit/internal/controls/view/view-impl.cpp @@@ -19,7 -19,6 +19,7 @@@ #include "view-impl.h" // EXTERNAL INCLUDES +#include // for strcmp #include #include #include @@@ -133,7 -132,7 +133,7 @@@ void View::SetBackground( ImageActor ba mBackgroundLayer = Layer::New(); mBackgroundLayer.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION ); - mBackgroundLayer.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + mBackgroundLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); // Add background layer to custom actor. Self().Add( mBackgroundLayer ); @@@ -153,8 -152,8 +153,8 @@@ } backgroundImage.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION ); - backgroundImage.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); - backgroundImage.SetSizeScalePolicy( FILL_WITH_ASPECT_RATIO ); + backgroundImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + backgroundImage.SetSizeScalePolicy( SizeScalePolicy::FILL_WITH_ASPECT_RATIO ); mBackgroundLayer.Add( backgroundImage ); RelayoutRequest(); diff --combined dali-toolkit/internal/focus-manager/focus-manager-impl.cpp index 1dee2b2,24343dd..b1f3c14 --- a/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/focus-manager-impl.cpp @@@ -19,7 -19,6 +19,7 @@@ #include "focus-manager-impl.h" // EXTERNAL INCLUDES +#include // for strcmp #include #include #include @@@ -675,7 -674,7 +675,7 @@@ void FocusManager::CreateDefaultFocusIn focusIndicator.SetPosition(Vector3(0.0f, 0.0f, 1.0f)); // Apply size constraint to the focus indicator - focusIndicator.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + focusIndicator.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); SetFocusIndicatorActor(focusIndicator); } diff --combined dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp index 8e02311,ff75d04..5b0bcb5 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp @@@ -19,7 -19,6 +19,7 @@@ #include "keyboard-focus-manager-impl.h" // EXTERNAL INCLUDES +#include // for strcmp #include #include #include @@@ -478,7 -477,7 +478,7 @@@ void KeyboardFocusManager::CreateDefaul focusIndicator.SetPosition(Vector3(0.0f, 0.0f, 1.0f)); // Apply size constraint to the focus indicator - focusIndicator.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + focusIndicator.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); SetFocusIndicatorActor(focusIndicator); } diff --combined dali-toolkit/public-api/controls/control-impl.cpp index 16b4e67,9e21d2a..d65c16b --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@@ -19,8 -19,6 +19,8 @@@ #include // EXTERNAL INCLUDES +#include // for strcmp +#include #include #include #include @@@ -420,13 -418,13 +420,13 @@@ Vector3 Control::GetNaturalSize( return mImpl->mNaturalSize; } - float Control::CalculateChildSize( const Dali::Actor& child, Dimension dimension ) + float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) { // Could be overridden in derived classes. return CalculateChildSizeBase( child, dimension ); } - bool Control::RelayoutDependentOnChildren( Dimension dimension ) + bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) { return RelayoutDependentOnChildrenBase( dimension ); } @@@ -900,11 -898,11 +900,11 @@@ void Control::OnControlSizeSet( const V { } - void Control::OnCalculateRelayoutSize( Dimension dimension ) + void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) { } - void Control::OnLayoutNegotiated( float size, Dimension dimension ) + void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) { } @@@ -916,7 -914,7 +916,7 @@@ void Control::OnRelayout( const Vector2 } } - void Control::OnSetResizePolicy( ResizePolicy policy, Dimension dimension ) + void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { }