From: Paul Wisbey
Date: Thu, 19 Mar 2015 09:55:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/tizen' into new_text
X-Git-Tag: dali_1.0.38~11^2~44
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=10d2080e1d25b75347daa2f8c2dcee494fbcb175;hp=-c
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
dali-toolkit/internal/controls/text-input/text-input-impl.cpp
dali-toolkit/internal/controls/text-view/text-view-impl.cpp
Change-Id: Ibbbecdb2962e4f0cfce3ff0e7c91efcd8bfb2170
---
10d2080e1d25b75347daa2f8c2dcee494fbcb175
diff --combined automated-tests/src/dali-toolkit/CMakeLists.txt
index aff9f85,03399af..5c19f09
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -24,12 -24,10 +24,10 @@@ SET(TC_SOURCE
utc-Dali-JsonParser.cpp
utc-Dali-KeyInputFocusManager.cpp
utc-Dali-NavigationControl.cpp
- utc-Dali-NavigationLayout.cpp
utc-Dali-OverlayEffect.cpp
utc-Dali-Page.cpp
utc-Dali-PageTurnEffect.cpp
utc-Dali-PageTurnView.cpp
- utc-Dali-RollLayout.cpp
utc-Dali-ScrollView.cpp
utc-Dali-ShadowView.cpp
utc-Dali-ShearEffect.cpp
@@@ -53,6 -51,7 +51,6 @@@
utc-Dali-ItemLayout.cpp
utc-Dali-ItemView.cpp
utc-Dali-KeyboardFocusManager.cpp
- utc-Dali-MarkupProcessor.cpp
utc-Dali-MaskEffect.cpp
utc-Dali-NinePatchMaskEffect.cpp
utc-Dali-Popup.cpp
@@@ -64,6 -63,8 +62,6 @@@
utc-Dali-StyleManager.cpp
utc-Dali-SuperBlurView.cpp
utc-Dali-SwirlEffect.cpp
- utc-Dali-TextInput.cpp
- utc-Dali-TextView.cpp
)
# Append list of test harness files (Won't get parsed for test cases)
diff --combined build/tizen/configure.ac
index ee0034e,a36e0a8..7a90b2a
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@@ -30,6 -30,7 +30,6 @@@ AC_SUBST(DALI_TOOLKIT_VERSION
PKG_CHECK_MODULES(DALICORE, dali-core)
PKG_CHECK_MODULES(DALI, dali)
-PKG_CHECK_MODULES(FRIBIDI, fribidi)
DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
@@@ -68,7 -69,7 +68,7 @@@ AM_CONDITIONAL([ENABLE_JAVASCRIPT_PLUGI
# Tizen Profile options
AC_ARG_ENABLE([profile],
- [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,LITE,WEARABLE,TV],
+ [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,WEARABLE,TV],
[Select the variant of tizen])],
[dali_profile=$enableval],
[dali_profile=COMMON])
@@@ -85,10 -86,6 +85,10 @@@ els
dataReadOnlyDir=${prefix}/share/dali/
fi
+DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDALI_PROFILE_${enable_profile}"
+AM_CONDITIONAL([COMMON_PROFILE], [test x$enable_profile = xCOMMON])
+AM_CONDITIONAL([MOBILE_PROFILE], [test x$enable_profile = xMOBILE])
+
AC_SUBST(dataReadWriteDir)
AC_SUBST(dataReadOnlyDir)
AC_SUBST(DALI_TOOLKIT_CFLAGS)
diff --combined dali-toolkit/dali-toolkit.h
index 8949d3f,ea7bec4..cbb33ea
--- a/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@@ -57,8 -57,6 +57,6 @@@
#include
#include
#include
- #include
- #include
#include
#include
#include
@@@ -75,8 -73,8 +73,8 @@@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
@@@ -84,11 -82,11 +82,11 @@@
#include
#include
-#include
-
#include
#include
+#include
+
#include
#include
#include
diff --combined dali-toolkit/internal/text/clipping/text-clipper.cpp
index 416fdba,0000000..b2478e4
mode 100644,000000..100644
--- a/dali-toolkit/internal/text/clipping/text-clipper.cpp
+++ b/dali-toolkit/internal/text/clipping/text-clipper.cpp
@@@ -1,157 -1,0 +1,156 @@@
+/*
+ * Copyright (c) 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+// CLASS HEADER
+#include
+
+// EXTERNAL INCLUDES
+#include
+#include
+#include
+#include
+
+namespace
+{
+
+// Currently on desktop machines 2k x 2k is the maximum frame buffer size, on target is 4k x 4k.
+const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f;
+
+} // namespace
+
+
+namespace Dali
+{
+
+namespace Toolkit
+{
+
+namespace Text
+{
+
+ClipperPtr Clipper::New( const Vector2& size )
+{
+ ClipperPtr clipper( new Clipper() );
+
+ // Second-phase init
+ clipper->Initialize( size );
+
+ return clipper;
+}
+
+Actor Clipper::GetRootActor() const
+{
+ return mOffscreenRootActor;
+}
+
+ImageActor Clipper::GetImageActor() const
+{
+ return mImageActor;
+}
+
+void Clipper::Refresh( const Vector2& size )
+{
+ const Size offscreenSize( std::min( MAX_OFFSCREEN_RENDERING_SIZE, size.width ),
+ std::min( MAX_OFFSCREEN_RENDERING_SIZE, size.height ) );
+
+ const bool sizeChanged = offscreenSize != mCurrentOffscreenSize;
+
+ if( sizeChanged )
+ {
+ // Reconfigure camera for current size.
+ mOffscreenCameraActor.SetOrthographicProjection( offscreenSize );
+
+ // Recreate frame buffer for offscreen rendering when the size changes.
+ FrameBufferImage frameBufferImage = FrameBufferImage::New( offscreenSize.width,
+ offscreenSize.height,
+ Pixel::RGBA8888 );
+ mImageActor.SetSize( offscreenSize );
+ mImageActor.SetImage( frameBufferImage );
+ mRenderTask.SetTargetFrameBuffer( frameBufferImage );
+
+ // Stores current size to avoid create new Dali resources if text changes.
+ mCurrentOffscreenSize = offscreenSize;
+ }
+
+ mRenderTask.SetRefreshRate( RenderTask::REFRESH_ONCE );
+}
+
+void Clipper::Initialize( const Vector2& size )
+{
+ const Size offscreenSize( std::min( MAX_OFFSCREEN_RENDERING_SIZE, size.width ),
+ std::min( MAX_OFFSCREEN_RENDERING_SIZE, size.height ) );
+
+ // Create a root actor and an image actor for offscreen rendering.
+ mOffscreenRootActor = Layer::New();
+ mOffscreenRootActor.SetColorMode( USE_OWN_COLOR );
+ mOffscreenRootActor.SetPositionInheritanceMode( DONT_INHERIT_POSITION );
- mOffscreenRootActor.SetInheritRotation( false );
+ mOffscreenRootActor.SetInheritScale( false );
+ mOffscreenRootActor.SetDepthTestDisabled( true );
+ mOffscreenRootActor.SetSize( offscreenSize );
+
+ mImageActor = ImageActor::New();
+ mImageActor.SetParentOrigin( ParentOrigin::CENTER );
+ mImageActor.SetBlendFunc( BlendingFactor::ONE, BlendingFactor::ONE_MINUS_SRC_ALPHA,
+ BlendingFactor::ONE, BlendingFactor::ONE );
+ mImageActor.SetScale( Vector3( 1.0f, -1.0f, 1.0f ) );
+ mImageActor.SetSize( offscreenSize );
+
+ // Creates a new camera actor.
+ mOffscreenCameraActor = CameraActor::New();
+ mOffscreenCameraActor.SetParentOrigin( ParentOrigin::CENTER );
+ mOffscreenCameraActor.SetOrthographicProjection( offscreenSize );
+ mOffscreenRootActor.Add( mOffscreenCameraActor ); // camera to shoot the offscreen text
+
+ // Creates a new render task.
+ mRenderTask = Stage::GetCurrent().GetRenderTaskList().CreateTask();
+ mRenderTask.SetSourceActor( mOffscreenRootActor );
+ mRenderTask.SetClearColor( Color::TRANSPARENT );
+ mRenderTask.SetClearEnabled( true );
+ mRenderTask.SetExclusive( true );
+ mRenderTask.SetCameraActor( mOffscreenCameraActor );
+
+ // Creates a frame buffer for offscreen rendering
+ FrameBufferImage frameBufferImage = FrameBufferImage::New( offscreenSize.width,
+ offscreenSize.height,
+ Pixel::RGBA8888 );
+ mImageActor.SetImage( frameBufferImage );
+ mRenderTask.SetTargetFrameBuffer( frameBufferImage );
+
+ // Stores current size to avoid create new Dali resources if text changes.
+ mCurrentOffscreenSize = offscreenSize;
+}
+
+Clipper::Clipper()
+{
+}
+
+Clipper::~Clipper()
+{
+ if( Stage::IsInstalled() )
+ {
+ UnparentAndReset( mOffscreenRootActor );
+ UnparentAndReset( mImageActor );
+
+ Stage::GetCurrent().GetRenderTaskList().RemoveTask( mRenderTask );
+ }
+}
+
+} // namespace Text
+
+} // namespace Toolkit
+
+} // namespace Dali
diff --combined dali-toolkit/public-api/file.list
index 8e1ccdf,0f06f3d..cf45789
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@@ -29,8 -29,6 +29,6 @@@ public_api_src_files =
$(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
$(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
$(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \
- $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.cpp \
- $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.cpp \
$(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.cpp \
$(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-carousel-effect.cpp \
$(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \
@@@ -50,8 -48,8 +48,8 @@@
$(public_api_src_dir)/controls/slider/slider.cpp \
$(public_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
$(public_api_src_dir)/controls/table-view/table-view.cpp \
- $(public_api_src_dir)/controls/text-input/text-input.cpp \
- $(public_api_src_dir)/controls/text-view/text-view.cpp \
+ $(public_api_src_dir)/controls/text-controls/text-label.cpp \
+ $(public_api_src_dir)/controls/text-controls/text-field.cpp \
$(public_api_src_dir)/controls/tool-bar/tool-bar.cpp \
$(public_api_src_dir)/controls/bloom-view/bloom-view.cpp \
$(public_api_src_dir)/controls/cluster/cluster-style.cpp \
@@@ -63,6 -61,7 +61,6 @@@
$(public_api_src_dir)/focus-manager/focus-manager.cpp \
$(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
$(public_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
- $(public_api_src_dir)/markup-processor/markup-processor.cpp \
$(public_api_src_dir)/shader-effects/bubble-effect/bubble-effect.cpp \
$(public_api_src_dir)/shader-effects/bubble-effect/color-adjuster.cpp \
$(public_api_src_dir)/shader-effects/alpha-discard-effect.cpp \
@@@ -157,8 -156,6 +155,6 @@@ public_api_item_view_header_files =
$(public_api_src_dir)/controls/scrollable/item-view/item-layout.h \
$(public_api_src_dir)/controls/scrollable/item-view/item-view-declarations.h \
$(public_api_src_dir)/controls/scrollable/item-view/item-view.h \
- $(public_api_src_dir)/controls/scrollable/item-view/navigation-layout.h \
- $(public_api_src_dir)/controls/scrollable/item-view/roll-layout.h \
$(public_api_src_dir)/controls/scrollable/item-view/spiral-layout.h
public_api_magnifier_header_files = \
@@@ -206,9 -203,11 +202,9 @@@ public_api_super_blur_view_header_file
public_api_table_view_header_files = \
$(public_api_src_dir)/controls/table-view/table-view.h
-public_api_text_input_header_files = \
- $(public_api_src_dir)/controls/text-input/text-input.h
-
-public_api_text_view_header_files = \
- $(public_api_src_dir)/controls/text-view/text-view.h
+public_api_text_controls_header_files = \
+ $(public_api_src_dir)/controls/text-controls/text-label.h \
+ $(public_api_src_dir)/controls/text-controls/text-field.h
public_api_tool_bar_header_files = \
$(public_api_src_dir)/controls/tool-bar/tool-bar.h
@@@ -226,6 -225,9 +222,6 @@@ public_api_focus_manager_header_files
$(public_api_src_dir)/focus-manager/keyboard-focus-manager.h \
$(public_api_src_dir)/focus-manager/keyinput-focus-manager.h
-public_api_markup_processor_header_files = \
- $(public_api_src_dir)/markup-processor/markup-processor.h
-
public_api_shader_effects_header_files = \
$(public_api_src_dir)/shader-effects/alpha-discard-effect.h \
$(public_api_src_dir)/shader-effects/bendy-effect.h \
@@@ -273,5 -275,3 +269,5 @@@ public_api_scripting_header_files =
$(public_api_src_dir)/scripting/script.h \
$(public_api_src_dir)/scripting/script-plugin.h
+public_api_rendering_backend_header_files = \
+ $(public_api_src_dir)/text/rendering-backend.h