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
Added Property for the rendering back-end
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-field-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-field-impl.h
b/dali-toolkit/internal/controls/text-controls/text-field-impl.h
index
4e18eb2
..
443e3e1
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.h
@@
-1,5
+1,5
@@
-#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_
LABEL
_H__
-#define __DALI_TOOLKIT_INTERNAL_TEXT_
LABEL
_H__
+#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_
FIELD
_H__
+#define __DALI_TOOLKIT_INTERNAL_TEXT_
FIELD
_H__
/*
* Copyright (c) 2015 Samsung Electronics Co., Ltd.
/*
* Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@
-53,11
+53,6
@@
public:
*/
static Toolkit::TextField New();
*/
static Toolkit::TextField New();
- /**
- * @copydoc Dali::Toollkit::TextField::SetRenderer()
- */
- void SetRenderer( Text::RendererPtr renderer );
-
// Properties
/**
// Properties
/**
@@
-121,26
+116,28
@@
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
+
+ unsigned int mRenderingBackend;
};
} // namespace Internal
// Helpers for public-api forwarding methods
};
} // namespace Internal
// Helpers for public-api forwarding methods
-inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& text
Label
)
+inline Toolkit::Internal::TextField& GetImpl( Toolkit::TextField& text
Field
)
{
{
- DALI_ASSERT_ALWAYS(text
Label
);
+ DALI_ASSERT_ALWAYS(text
Field
);
- Dali::RefObject& handle = text
Label
.GetImplementation();
+ Dali::RefObject& handle = text
Field
.GetImplementation();
return static_cast<Toolkit::Internal::TextField&>(handle);
}
return static_cast<Toolkit::Internal::TextField&>(handle);
}
-inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& text
Label
)
+inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& text
Field
)
{
{
- DALI_ASSERT_ALWAYS(text
Label
);
+ DALI_ASSERT_ALWAYS(text
Field
);
- const Dali::RefObject& handle = text
Label
.GetImplementation();
+ const Dali::RefObject& handle = text
Field
.GetImplementation();
return static_cast<const Toolkit::Internal::TextField&>(handle);
}
return static_cast<const Toolkit::Internal::TextField&>(handle);
}
@@
-149,4
+146,4
@@
inline const Toolkit::Internal::TextField& GetImpl( const Toolkit::TextField& te
} // namespace Dali
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_TEXT_
LABEL
_H__
+#endif // __DALI_TOOLKIT_INTERNAL_TEXT_
FIELD
_H__