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
Implement scroll bar in the TextEditor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-editor-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index
2d7190b
..
cc864f1
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_H
/*
#define DALI_TOOLKIT_INTERNAL_TEXT_EDITOR_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.
@@
-20,15
+20,17
@@
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
// EXTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/clipboard-event-notifier.h>
+#include <dali/public-api/animation/animation.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/scroll-bar/scroll-bar.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
#include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
-#include <dali-toolkit/internal/text/clipping/text-clipper.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/text-control-interface.h>
#include <dali-toolkit/internal/text/text-editable-control-interface.h>
#include <dali-toolkit/internal/text/text-controller.h>
#include <dali-toolkit/internal/text/decorator/text-decorator.h>
#include <dali-toolkit/internal/text/text-control-interface.h>
#include <dali-toolkit/internal/text/text-editable-control-interface.h>
#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-vertical-scroller.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
namespace Dali
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
namespace Dali
@@
-206,18
+208,18
@@
private: // Implementation
void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType );
/**
void GetHandleImagePropertyValue( Property::Value& value, Text::HandleType handleType, Text::HandleImageType handleImageType );
/**
- * @brief
Enable or disable clipping
.
+ * @brief
Callback when keyboard is shown/hidden
.
*
*
- * @param[in]
size The area to clip withi
n.
+ * @param[in]
keyboardShown True if keyboard is show
n.
*/
*/
- void
EnableClipping( const Vector2& size
);
+ void
KeyboardStatusChanged( bool keyboardShown
);
/**
/**
- * @brief
Callback when keyboard is shown/hidden.
+ * @brief
update scroll bar position
*
*
- *
@param[in] keyboardShown True if keyboard is shown.
+ *
If text scroll is occurred, create or update scroll bar position
*/
*/
- void
KeyboardStatusChanged( bool keyboardShown
);
+ void
UpdateScrollBar(
);
/**
* @brief Callback when TextEditor is touched
/**
* @brief Callback when TextEditor is touched
@@
-235,6
+237,13
@@
private: // Implementation
void OnIdleSignal();
/**
void OnIdleSignal();
/**
+ * @brief set RenderActor's position with new scrollPosition
+ *
+ * Apply updated scroll position or start scroll animation if VerticalScrollAnimation is enabled
+ */
+ void ApplyScrollPosition();
+
+ /**
* Construct a new TextEditor.
*/
TextEditor();
* Construct a new TextEditor.
*/
TextEditor();
@@
-257,22
+266,30
@@
private: // Implementation
void OnStageConnect( Dali::Actor actor );
private: // Data
void OnStageConnect( Dali::Actor actor );
private: // Data
-
// Signals
Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
// Signals
Toolkit::TextEditor::TextChangedSignalType mTextChangedSignal;
Toolkit::TextEditor::InputStyleChangedSignalType mInputStyleChangedSignal;
+ ImfManager mImfManager;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
Text::DecoratorPtr mDecorator;
- Text::ClipperPtr mClipper;
+ Text::TextVerticalScrollerPtr mTextVerticalScroller;
+ Toolkit::Control mStencil;
+ Toolkit::ScrollBar mScrollBar;
+ Dali::Animation mAnimation; ///< Scroll indicator Show/Hide Animation.
+ Dali::TimePeriod mAnimationPeriod;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
CallbackBase* mIdleCallback;
std::vector<Actor> mClippingDecorationActors; ///< Decoration actors which need clipping.
Actor mRenderableActor;
CallbackBase* mIdleCallback;
+ float mAlignmentOffset;
+ float mScrollAnimationDuration;
int mRenderingBackend;
bool mHasBeenStaged:1;
int mRenderingBackend;
bool mHasBeenStaged:1;
+ bool mScrollAnimationEnabled:1;
+ bool mScrollBarEnabled:1;
};
} // namespace Internal
};
} // namespace Internal