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
[dali_1.9.29] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
visual-factory
/
visual-base.cpp
diff --git
a/dali-toolkit/devel-api/visual-factory/visual-base.cpp
b/dali-toolkit/devel-api/visual-factory/visual-base.cpp
index
4454e98
..
94f7617
100644
(file)
--- a/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
+++ b/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
@@
-1,5
+1,5
@@
-
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+/*
+ * Copyright (c) 20
20
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,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
Visual::Base::Base()
{
}
Visual::Base::Base()
{
}
@@
-35,60
+33,70
@@
Visual::Base::~Base()
{
}
{
}
-Visual::Base::Base(
const Visual::Base& handle
)
-: BaseHandle(
handle
)
+Visual::Base::Base(
const Visual::Base& handle
)
+: BaseHandle(
handle
)
{
}
{
}
-Visual::Base& Visual::Base::operator=(
const Visual::Base& handle
)
+Visual::Base& Visual::Base::operator=(
const Visual::Base& handle
)
{
{
- BaseHandle::operator=(
handle
);
+ BaseHandle::operator=(
handle
);
return *this;
}
return *this;
}
-Visual::Base::Base(Internal::Visual::Base *impl)
-: BaseHandle( impl )
+Visual::Base::Base(Internal::Visual::Base* impl)
+: BaseHandle(impl)
+{
+}
+
+void Visual::Base::SetName(const std::string& name)
+{
+ GetImplementation(*this).SetName(name);
+}
+
+const std::string& Visual::Base::GetName() const
{
{
+ return GetImplementation(*this).GetName();
}
}
-void Visual::Base::Set
Name( const std::string& name
)
+void Visual::Base::Set
TransformAndSize(const Dali::Property::Map& transform, Size controlSize
)
{
{
- GetImplementation(
*this ).SetName( name
);
+ GetImplementation(
*this).SetTransformAndSize(transform, controlSize
);
}
}
-
const std::string& Visual::Base::GetName(
)
+
float Visual::Base::GetHeightForWidth(float width
)
{
{
- return GetImplementation(
*this ).GetName(
);
+ return GetImplementation(
*this).GetHeightForWidth(width
);
}
}
-
void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize
)
+
float Visual::Base::GetWidthForHeight(float height
)
{
{
-
GetImplementation( *this ).SetTransformAndSize( transform, controlSize
);
+
return GetImplementation(*this).GetWidthForHeight(height
);
}
}
-float Visual::Base::GetHeightForWidth( float width ) const
+void Visual::Base::GetNaturalSize(Vector2& naturalSize)
{
{
-
return GetImplementation( *this ).GetHeightForWidth( width
);
+
GetImplementation(*this).GetNaturalSize(naturalSize
);
}
}
-void Visual::Base::
GetNaturalSize(Vector2& naturalSize
)
+void Visual::Base::
SetDepthIndex(int index
)
{
{
- GetImplementation(
*this ).GetNaturalSize( naturalSize
);
+ GetImplementation(
*this).SetDepthIndex(index
);
}
}
-void Visual::Base::SetDepthIndex( float index )
+int Visual::Base::GetDepthIndex() const
{
{
-
GetImplementation( *this ).SetDepthIndex( index
);
+
return GetImplementation(*this).GetDepthIndex(
);
}
}
-
float Visual::Base::GetDepthIndex(
) const
+
void Visual::Base::CreatePropertyMap(Dali::Property::Map& map
) const
{
{
-
return GetImplementation( *this ).GetDepthIndex(
);
+
GetImplementation(*this).CreatePropertyMap(map
);
}
}
-
void Visual::Base::CreatePropertyMap( Property::Map& map
) const
+
Visual::Type Visual::Base::GetType(
) const
{
{
-
GetImplementation( *this ).CreatePropertyMap( map
);
+
return GetImplementation(*this).GetType(
);
}
} // namespace Toolkit
}
} // namespace Toolkit