From: Seoyeon Kim Date: Wed, 12 Feb 2020 04:45:12 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: accepted/tizen/unified/20200214.050229^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=f66c7164eeb369c75f236641dd43d6ccd0bb8520;hp=8f56b75886718884d7759db2da58dea0e20f15ad Merge branch 'devel/master' into tizen --- diff --git a/examples/text-editor/text-editor-example.cpp b/examples/text-editor/text-editor-example.cpp index af02cd8..c775f19 100644 --- a/examples/text-editor/text-editor-example.cpp +++ b/examples/text-editor/text-editor-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -41,7 +41,7 @@ const float TOOLBAR_TITLE_PERCENTAGE = 0.7f; ///< The tit const float TOOLBAR_HEIGHT_PERCENTAGE = 0.05f; ///< The toolbar's height as a percentage of the stage's height. const float TOOLBAR_PADDING = 4.f; ///< The padding in pixels. const float BUTTON_PERCENTAGE = 0.8f; ///< The button's height as a percentage of the space for the buttons in the toolbar. -const Vector3 TEXT_EDITOR_RELATIVE_SIZE( 1.f, 0.45f, 1.0f ); ///< The size of the text editor as a percentage of the stage's size. +const Vector3 TEXT_EDITOR_RELATIVE_SIZE( 0.9f, 0.5f, 1.0f ); ///< The size of the text editor as a percentage of the stage's size. const Vector4 TEXT_EDITOR_BACKGROUND_COLOR( 1.f, 1.f, 1.f, 0.15f ); ///< The background color of the text editor. const Vector4 COLORS[] = { Color::RED, @@ -152,7 +152,7 @@ public: mEditor = TextEditor::New(); mEditor.SetParentOrigin( ParentOrigin::TOP_CENTER ); mEditor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); - mEditor.SetPosition( 0.f, toolBarHeight, 0.f ); + mEditor.SetPosition( 0.f, toolBarHeight * 2.0f, 0.f ); mEditor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); mEditor.SetSizeModeFactor( TEXT_EDITOR_RELATIVE_SIZE ); diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 3f3842d..a9245bd 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.4.56 +Version: 1.4.57 Release: 1 Group: System/Libraries License: Apache-2.0