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
Disable Image Visual Pixel alignment when using Layer3D
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
flex-container
/
flex-container-impl.h
diff --git
a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h
index
17ea2b6
..
ce09e23
100644
(file)
--- a/
dali-toolkit/internal/controls/flex-container/flex-container-impl.h
+++ b/
dali-toolkit/internal/controls/flex-container/flex-container-impl.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__
/*
#define __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-23,10
+23,10
@@
// 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/
devel
-api/controls/flex-container/flex-container.h>
+#include <dali-toolkit/
public
-api/controls/flex-container/flex-container.h>
extern "C"
{
extern "C"
{
-#include
"layout.h"
+#include
<dali-toolkit/third-party/facebook-flexbox/layout.h>
}
namespace Dali
}
namespace Dali
@@
-205,11
+205,6
@@
private: // From Control
*/
virtual void OnSizeSet( const Vector3& size );
*/
virtual void OnSizeSet( const Vector3& size );
- /**
- * @copydoc CustomActorImpl::OnSizeAnimation(Animation&, const Vector3&)
- */
- virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize);
-
private: // Implementation
/**
private: // Implementation
/**