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=d6ccf4b35ee72b694908fd3228cb3334892518ca;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=9dfe326faf6f6376bb7f4415a8ca35792c669d4c 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 d6ccf4b..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 @@ -212,14 +215,14 @@ 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 @@ -497,6 +500,8 @@ private: // Data 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 @@ -528,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