X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftable-view%2Ftable-view-impl.h;h=b9b708f5b36639312c3e7334573518f7f3e9dce2;hp=9939a051200813b304cdcd7a4eb0171fd4ffeadd;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=3b16ae16f01bd50a26e6c44e6e20ebb8499b4f91 diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.h b/dali-toolkit/internal/controls/table-view/table-view-impl.h old mode 100644 new mode 100755 index 9939a05..b9b708f --- a/dali-toolkit/internal/controls/table-view/table-view-impl.h +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H +#define DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,9 +18,12 @@ * */ +// EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include -#include +#include #include "array-2d.h" namespace Dali @@ -40,23 +43,6 @@ class TableView : public Control { public: - // Properties - enum - { - TABLEVIEW_PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, - TABLEVIEW_PROPERTY_END_INDEX = TABLEVIEW_PROPERTY_START_INDEX + 1000 ///< Reserving 1000 property indices - }; - - /** - * Structure for the layout data - */ - struct CellData - { - // data members - Actor actor; - Toolkit::TableView::CellPosition position; - }; - /** * Create a new TableView. * @return A smart-pointer to the newly allocated TableView. @@ -66,22 +52,22 @@ public: /** * @copydoc Toolkit::TableView::AddChild */ - bool AddChild( Actor child, Toolkit::TableView::CellPosition position ); + bool AddChild( Actor& child, const Toolkit::TableView::CellPosition& position ); /** * @copydoc Toolkit::TableView::GetChildAt */ - Actor GetChildAt( Toolkit::TableView::CellPosition position ); + Actor GetChildAt( const Toolkit::TableView::CellPosition& position ); /** * @copydoc Toolkit::TableView::RemoveChildAt */ - Actor RemoveChildAt( Toolkit::TableView::CellPosition position ); + Actor RemoveChildAt( const Toolkit::TableView::CellPosition& position ); /** * @copydoc Toolkit::TableView::FindChildPosition */ - bool FindChildPosition( Actor child, Toolkit::TableView::CellPosition& position ); + bool FindChildPosition( const Actor& child, Toolkit::TableView::CellPosition& positionOut ); /** * @copydoc Toolkit::TableView::InsertRow @@ -134,24 +120,24 @@ public: Size GetCellPadding(); /** - * @copydoc Toolkit::TableView::SetFixedHeight + * @copydoc Toolkit::TableView::SetFitHeight */ - void SetFixedHeight( unsigned int rowIndex, float height ); + void SetFitHeight( unsigned int rowIndex ); /** - * @copydoc Toolkit::TableView::GetFixedHeight + * @copydoc Toolkit::TableView::IsFitHeight */ - float GetFixedHeight( unsigned int rowIndex ) const; + bool IsFitHeight( unsigned int rowIndex ) const; /** - * @copydoc Toolkit::TableView::SetRelativeHeight + * @copydoc Toolkit::TableView::SetFitWidth */ - void SetRelativeHeight( unsigned int rowIndex, float heightPercentage ); + void SetFitWidth( unsigned int columnIndex ); /** - * @copydoc Toolkit::TableView::GetRelativeHeight + * @copydoc Toolkit::TableView::IsFitWidth */ - float GetRelativeHeight( unsigned int rowIndex ) const; + bool IsFitWidth( unsigned int columnIndex ) const; /** * @copydoc Toolkit::TableView::SetFixedWidth @@ -164,6 +150,26 @@ public: float GetFixedWidth( unsigned int columnIndex ) const; /** + * @copydoc Toolkit::TableView::SetFixedHeight + */ + void SetFixedHeight( unsigned int rowIndex, float height ); + + /** + * @copydoc Toolkit::TableView::GetFixedHeight + */ + float GetFixedHeight( unsigned int rowIndex ) const; + + /** + * @copydoc Toolkit::TableView::SetRelativeHeight + */ + void SetRelativeHeight( unsigned int rowIndex, float heightPercentage ); + + /** + * @copydoc Toolkit::TableView::GetRelativeHeight + */ + float GetRelativeHeight( unsigned int rowIndex ) const; + + /** * @copydoc Toolkit::TableView::SetRelativeWidth */ void SetRelativeWidth( unsigned int columnIndex, float widthPercentage ); @@ -183,6 +189,11 @@ public: */ unsigned int GetColumns(); + /** + * @copydoc Toolkit::TableView::SetCellAlignment + */ + void SetCellAlignment( Toolkit::TableView::CellPosition position, HorizontalAlignment::Type horizontal, VerticalAlignment::Type vertical ); + // Properties /** @@ -204,19 +215,24 @@ public: private: // From Control /** - * @copydoc Control::OnControlChildAdd(Actor& child) + * @copydoc Control::OnChildAdd(Actor& child) */ - virtual void OnControlChildAdd(Actor& child); + virtual void OnChildAdd( Actor& child ); /** - * @copydoc Control::OnControlChildRemove(Actor& child) + * @copydoc Control::OnChildRemove(Actor& child) */ - virtual void OnControlChildRemove(Actor& child); + virtual void OnChildRemove( Actor& child ); /** * @copydoc Control::OnRelayout */ - virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container ); + virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + + /** + * @copydoc Control::CalculateChildSize + */ + virtual float CalculateChildSize( const Actor& child, Dimension::Type dimension ); /** * @copydoc Control::OnInitialize() @@ -226,11 +242,99 @@ private: // From Control /** * @copydoc Control::GetNextKeyboardFocusableActor */ - virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled); + virtual Actor GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled ); + + /** + * @copydoc Control::GetNaturalSize() + */ + virtual Vector3 GetNaturalSize(); + + /** + * @copydoc Control::RelayoutDependentOnChildren() + */ + virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ); + + /** + * @copydoc Control::OnCalculateRelayoutSize + */ + virtual void OnCalculateRelayoutSize( Dimension::Type dimension ); + + /** + * @copydoc Control::OnLayoutNegotiated + */ + virtual void OnLayoutNegotiated( float size, Dimension::Type dimension ); + + /** + * @copydoc CustomActorImpl::OnSizeSet( const Vector3& size ) + */ + virtual void OnSizeSet( const Vector3& size ); private: // Implementation /** + * Struct to hold data for rows and columns + * + * If sizePolicy is FIXED then size is the absolute size to use. + * If sizePolicy is FIT, RELATIVE or FILL then size is the calculated value of size. + */ + struct RowColumnData + { + /** + * Default constructor + */ + RowColumnData() + : size( 0.0f ), + fillRatio( 0.0f ), + position( 0.0f ), + sizePolicy( Toolkit::TableView::FILL ) + { + } + + /** + * Constructor + * + * @param[in] newSize The size to set for this data + * @param[in] newSizePolicy The policy used to interpret the size value + */ + RowColumnData( float newSize, float newFillRatio, Toolkit::TableView::LayoutPolicy newSizePolicy ) + : size( newSize ), + fillRatio( newFillRatio ), + position( 0.0f ), + sizePolicy( newSizePolicy ) + { + } + + float size; ///< Set or calculated size + float fillRatio; ///< Ratio to fill remaining space, only valid with RELATIVE or FILL policy + float position; ///< Position of the row/column, this value is updated during every Relayout round + Toolkit::TableView::LayoutPolicy sizePolicy; ///< The size policy used to interpret the size value + }; + + typedef Dali::Vector RowColumnArray; + +public: + + /** + * Structure for the layout data + */ + struct CellData + { + CellData() + : horizontalAlignment( HorizontalAlignment::LEFT ), + verticalAlignment( VerticalAlignment::TOP ) + { + } + + // data members + Dali::Actor actor; + Toolkit::TableView::CellPosition position; + HorizontalAlignment::Type horizontalAlignment; + VerticalAlignment::Type verticalAlignment; + }; + +private: + + /** * Construct a new TableView. */ TableView( unsigned int initialRows, unsigned int initialColumns ); @@ -266,14 +370,45 @@ private: // Implementation * @param child actor to remove * @return true if the actor was found */ - bool RemoveAllInstances( Actor child ); + bool RemoveAllInstances( const Actor& child ); /** - * Helper to update relative sizes - * @param fixedHeightsTotal sum of the fixed height rows - * @param fixedWidthsTotal sum of the fixed width columns + * @brief Calculate the ratio of FILL rows/columns + * + * @param[in] data The RowColumn data to compute the relative sizes for */ - void UpdateRelativeSizes( float& fixedHeightsTotal, float& fixedWidthsTotal ); + void CalculateFillSizes( RowColumnArray& data ); + + /** + * @brief Calculate the total fixed sizes for a row or column + * + * @param[in] data The row or column data to process + */ + float CalculateTotalFixedSize( const RowColumnArray& data ); + + /** + * @brief Calculate the sizes of FIT rows/columns + * + * @param[in] data The row or column data to process + * @param[in] dimension The dimension being calculated: row == Dimension::HEIGHT, column == Dimension::WIDTH + */ + void CalculateFitSizes( RowColumnArray& data, Dimension::Type dimension ); + + /** + * @brief Search for a FIT cell in the array + * + * @param[in] data The row or column data to process + * @return Return if a FIT cell was found or not + */ + bool FindFit( const RowColumnArray& data ); + + /** + * @brief Return the cell padding for a given dimension + * + * @param[in] dimension The dimension to return the padding for + * @return Return the padding (x = low, y = high) + */ + Vector2 GetCellPadding( Dimension::Type dimension ); /** * A reference counted object may only be deleted by calling Unreference() @@ -285,13 +420,15 @@ private: // scripting support /** * Called to set the heights/widths property. * @param[in] tableViewImpl The object whose property is set. - * @param[in] funcFixed The set function to call, it can be SetFixedHeight or SetFixedWidths. - * @param[in] funcRelative The set function to call, it can be SetRelativeHeight or SetRelativeWidths. + * @param[in] funcFixed The set function to call, it can be SetFixedHeight or SetFixedWidth. + * @param[in] funcRelative The set function to call, it can be SetRelativeHeight or SetRelativeWidth. + * @param[in] funcFit The set function to call, it can be SetFitHeight or SetFiltWidth. * @param[in] value The new property value. */ static void SetHeightOrWidthProperty( TableView& tableViewImpl, void(TableView::*funcFixed)(unsigned int, float), void(TableView::*funcRelative)(unsigned int, float), + void(TableView::*funcFit)(unsigned int), const Property::Value& map ); /** @@ -308,11 +445,10 @@ private: // scripting support /** * Generate the map type property value from the size vectors. - * @param[in] fixedSize The vector of fixed heights or widths. - * @param[in] relativeSize The vector of relative heights or widths. + * @param[in] data The array of row or column data * @param[out] map The property value. */ - void GetMapPropertyValue( const std::vector& fixedSize, const std::vector& relativeSize, Property::Map& map ); + void GetMapPropertyValue( const RowColumnArray& data, Property::Map& map ); /** @@ -357,15 +493,18 @@ private: private: // Data - Array2d mCellData; - Array2d mRelativeSizes; - std::vector mFixedHeights; - std::vector mRelativeHeights; - std::vector mFixedWidths; - std::vector mRelativeWidths; - Size mPadding; - bool mLayoutingChild; + Array2d mCellData; ///< Data for each cell: Actor, alignment settings etc + + RowColumnArray mRowData; ///< Data for each row + RowColumnArray mColumnData; ///< Data for each column + Size mFixedTotals; ///< Accumulated totals for fixed width and height + + Size mPadding; ///< Padding to apply to each cell + WeakHandle mPreviousFocusedActor; ///< Perviously focused actor + bool mLayoutingChild; ///< Can't be a bitfield due to Relayouting lock + bool mRowDirty : 1; ///< Flag to indicate the row data is dirty + bool mColumnDirty : 1; ///< Flag to indicate the column data is dirty }; } // namespace Internal @@ -394,4 +533,4 @@ inline const Toolkit::Internal::TableView& GetImpl( const Toolkit::TableView& ta } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H