Peter M. Groen / dali-demo

Commit b958f803dd60b02a4282cdced578a275b7e908b1

Authored by Adeel Kazmi
2 parents e32d97d8 cd6da6ee

[dali_1.5.0] Merge branch 'devel/master' 

Change-Id: Ib23e5d9a155cc08ec77b01eb031d7d491458dbec
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
examples/text-editor/text-editor-example.cpp
  View file @b958f80
1 /* 1 /*
2 - * Copyright (c) 2019 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * 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 @@ -41,7 +41,7 @@ const float TOOLBAR_TITLE_PERCENTAGE = 0.7f; ///< The tit
41 const float TOOLBAR_HEIGHT_PERCENTAGE = 0.05f; ///< The toolbar's height as a percentage of the stage's height. 41 const float TOOLBAR_HEIGHT_PERCENTAGE = 0.05f; ///< The toolbar's height as a percentage of the stage's height.
42 const float TOOLBAR_PADDING = 4.f; ///< The padding in pixels. 42 const float TOOLBAR_PADDING = 4.f; ///< The padding in pixels.
43 const float BUTTON_PERCENTAGE = 0.8f; ///< The button's height as a percentage of the space for the buttons in the toolbar. 43 const float BUTTON_PERCENTAGE = 0.8f; ///< The button's height as a percentage of the space for the buttons in the toolbar.
44 -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. 44 +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.
45 const Vector4 TEXT_EDITOR_BACKGROUND_COLOR( 1.f, 1.f, 1.f, 0.15f ); ///< The background color of the text editor. 45 const Vector4 TEXT_EDITOR_BACKGROUND_COLOR( 1.f, 1.f, 1.f, 0.15f ); ///< The background color of the text editor.
46 46
47 const Vector4 COLORS[] = { Color::RED, 47 const Vector4 COLORS[] = { Color::RED,
@@ -152,7 +152,7 @@ public: @@ -152,7 +152,7 @@ public:
152 mEditor = TextEditor::New(); 152 mEditor = TextEditor::New();
153 mEditor.SetParentOrigin( ParentOrigin::TOP_CENTER ); 153 mEditor.SetParentOrigin( ParentOrigin::TOP_CENTER );
154 mEditor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); 154 mEditor.SetAnchorPoint( AnchorPoint::TOP_CENTER );
155 - mEditor.SetPosition( 0.f, toolBarHeight, 0.f ); 155 + mEditor.SetPosition( 0.f, toolBarHeight * 2.0f, 0.f );
156 mEditor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); 156 mEditor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
157 mEditor.SetSizeModeFactor( TEXT_EDITOR_RELATIVE_SIZE ); 157 mEditor.SetSizeModeFactor( TEXT_EDITOR_RELATIVE_SIZE );
158 158
packaging/com.samsung.dali-demo.spec
  View file @b958f80
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.4.57 5 +Version: 1.5.0
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0