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
Merge "Add a TextEditor property to limit input to maximum characters" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.h
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
index
9edeca8
..
23b16f5
100644
(file)
--- a/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
+++ b/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_WIREFRAME_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_WIREFRAME_VISUAL_H
/*
- * Copyright (c) 201
6
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.
@@
-96,37
+96,44
@@
protected: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
-
virtual float GetHeightForWidth( float width )
;
+
float GetHeightForWidth( float width ) override
;
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
/**
* @copydoc Visual::Base::GetNaturalSize()
*/
- v
irtual void GetNaturalSize( Vector2& naturalSize )
;
+ v
oid GetNaturalSize( Vector2& naturalSize ) override
;
/**
* @copydoc Visual::Base::CreatePropertyMap()
*/
/**
* @copydoc Visual::Base::CreatePropertyMap()
*/
- v
irtual void DoCreatePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreatePropertyMap( Property::Map& map ) const override
;
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
/**
* @copydoc Visual::Base::CreateInstancePropertyMap
*/
- v
irtual void DoCreateInstancePropertyMap( Property::Map& map ) const
;
+ v
oid DoCreateInstancePropertyMap( Property::Map& map ) const override
;
/**
* @copydoc Visual::Base::DoSetProperties()
*/
/**
* @copydoc Visual::Base::DoSetProperties()
*/
- v
irtual void DoSetProperties( const Property::Map& propertyMap )
;
+ v
oid DoSetProperties( const Property::Map& propertyMap ) override
;
/**
/**
- * @copydoc Visual::Base::DoSetOnS
tag
e
+ * @copydoc Visual::Base::DoSetOnS
cen
e
*/
*/
- v
irtual void DoSetOnStage( Actor& actor )
;
+ v
oid DoSetOnScene( Actor& actor ) override
;
/**
* @copydoc Visual::Base::OnSetTransform
*/
/**
* @copydoc Visual::Base::OnSetTransform
*/
- virtual void OnSetTransform();
+ void OnSetTransform() override;
+
+ /**
+ * @copydoc Visual::Base::GetVisualObject
+ *
+ * Overriding as this visual can sometimes act as a proxy to the actual visual, i.e. when using debug rendering.
+ */
+ Base& GetVisualObject() override;
private:
/**
private:
/**