X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.h;h=83173953b817e169a842d841356a6a97fa153f65;hp=92ca3c9fbc3e514d8477bcf0b24f50ff5e7838d1;hb=9ddd5fea6278d06b8874988498c7c4c6508750ba;hpb=f2039d47f9bed8104575da80a2ecf0bb6e37ff8d diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h old mode 100755 new mode 100644 index 92ca3c9..8317395 --- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_GRID_LAYOUT_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -24,16 +24,12 @@ #include - namespace Dali { - namespace Toolkit { - namespace Internal { - class GridLayout; typedef IntrusivePtr GridLayoutPtr; ///< Pointer to a Dali::Toolkit::GridLayout object @@ -44,7 +40,6 @@ typedef IntrusivePtr GridLayoutPtr; ///< Pointer to a Dali::Toolkit: class GridLayout : public ItemLayout { public: - /** * @brief Create a new grid layout. */ @@ -211,7 +206,6 @@ public: int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) override; private: - /** * @copydoc ItemLayout::GetMinimumLayoutPosition() */ @@ -240,7 +234,7 @@ private: /** * @copydoc ItemLayout::GetDefaultItemSize() */ - void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const override; + void GetDefaultItemSize(unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize) const override; /** * @copydoc ItemLayout::GetScrollDirection() @@ -250,30 +244,27 @@ private: /** * @copydoc ItemLayout::ApplyConstraints() */ - void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) override; + void ApplyConstraints(Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor) override; /** * @copydoc ItemLayout::GetItemPosition() */ - Vector3 GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const override; + Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const override; protected: - /** * @brief Protected constructor; see also GridLayout::New(). */ GridLayout(); private: - // Undefined - GridLayout( const GridLayout& itemLayout ); + GridLayout(const GridLayout& itemLayout); // Undefined - GridLayout& operator=( const GridLayout& rhs ); + GridLayout& operator=(const GridLayout& rhs); private: - struct Impl; Impl* mImpl; };