projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Fix role setting
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
table-view
/
table-view-impl.h
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
(file)
new mode 100755
(executable)
index
2543b5e
..
0bd7138
--- 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) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* 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 <dali/public-api/object/weak-handle.h>
+
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/
public
-api/controls/table-view/table-view.h>
+#include <dali-toolkit/
devel
-api/controls/table-view/table-view.h>
#include "array-2d.h"
namespace Dali
#include "array-2d.h"
namespace Dali
@@
-212,54
+215,59
@@
public:
private: // From Control
/**
private: // From Control
/**
- * @copydoc Control::OnC
ontrolC
hildAdd(Actor& child)
+ * @copydoc Control::OnChildAdd(Actor& child)
*/
*/
- v
irtual void OnControlChildAdd( Actor& child )
;
+ v
oid OnChildAdd( Actor& child ) override
;
/**
/**
- * @copydoc Control::OnC
ontrolC
hildRemove(Actor& child)
+ * @copydoc Control::OnChildRemove(Actor& child)
*/
*/
- v
irtual void OnControlChildRemove( Actor& child )
;
+ v
oid OnChildRemove( Actor& child ) override
;
/**
* @copydoc Control::OnRelayout
*/
/**
* @copydoc Control::OnRelayout
*/
- v
irtual void OnRelayout( const Vector2& size, RelayoutContainer& container )
;
+ v
oid OnRelayout( const Vector2& size, RelayoutContainer& container ) override
;
/**
* @copydoc Control::CalculateChildSize
*/
/**
* @copydoc Control::CalculateChildSize
*/
-
virtual float CalculateChildSize( const Actor& child, Dimension::Type dimension )
;
+
float CalculateChildSize( const Actor& child, Dimension::Type dimension ) override
;
/**
* @copydoc Control::OnInitialize()
*/
/**
* @copydoc Control::OnInitialize()
*/
- v
irtual void OnInitialize()
;
+ v
oid OnInitialize() override
;
/**
* @copydoc Control::GetNextKeyboardFocusableActor
*/
/**
* @copydoc Control::GetNextKeyboardFocusableActor
*/
-
virtual Actor GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled )
;
+
Actor GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled ) override
;
/**
* @copydoc Control::GetNaturalSize()
*/
/**
* @copydoc Control::GetNaturalSize()
*/
-
virtual Vector3 GetNaturalSize()
;
+
Vector3 GetNaturalSize() override
;
/**
* @copydoc Control::RelayoutDependentOnChildren()
*/
/**
* @copydoc Control::RelayoutDependentOnChildren()
*/
-
virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS )
;
+
bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ) override
;
/**
* @copydoc Control::OnCalculateRelayoutSize
*/
/**
* @copydoc Control::OnCalculateRelayoutSize
*/
- v
irtual void OnCalculateRelayoutSize( Dimension::Type dimension )
;
+ v
oid OnCalculateRelayoutSize( Dimension::Type dimension ) override
;
/**
* @copydoc Control::OnLayoutNegotiated
*/
/**
* @copydoc Control::OnLayoutNegotiated
*/
- virtual void OnLayoutNegotiated( float size, Dimension::Type dimension );
+ void OnLayoutNegotiated( float size, Dimension::Type dimension ) override;
+
+ /**
+ * @copydoc CustomActorImpl::OnSizeSet( const Vector3& size )
+ */
+ void OnSizeSet( const Vector3& size ) override;
private: // Implementation
private: // Implementation
@@
-492,6
+500,8
@@
private: // Data
Size mFixedTotals; ///< Accumulated totals for fixed width and height
Size mPadding; ///< Padding to apply to each cell
Size mFixedTotals; ///< Accumulated totals for fixed width and height
Size mPadding; ///< Padding to apply to each cell
+
+ WeakHandle<Actor> 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
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
@@
-523,4
+533,4
@@
inline const Toolkit::Internal::TableView& GetImpl( const Toolkit::TableView& ta
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__
+#endif //
DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H