Peter M. Groen / dali-demo

Commit e52900daacfd44fcebf2d7445a764a5034febb0a

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents f5531b6a 6bccceeb

Merge "Remove non-touch related deprecated APIs" into devel/master

Inline Side-by-side
Showing 37 changed files with 44 additions and 142 deletions
examples/animated-shapes/animated-shapes-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -103,9 +103,6 @@ public:
103 103 // The Init signal is received once (only) during the Application lifetime
104 104 void Create( Application& application )
105 105 {
106   - // Hide the indicator bar
107   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
108   -
109 106 Stage stage = Stage::GetCurrent();
110 107  
111 108 // Creates the background gradient
... ...
examples/bezier-curve/bezier-curve-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -149,9 +149,6 @@ public:
149 149 // The Init signal is received once (only) during the Application lifetime
150 150 void Create( Application& application )
151 151 {
152   - // Hide the indicator bar
153   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
154   -
155 152 Stage stage = Stage::GetCurrent();
156 153 stage.KeyEventSignal().Connect( this, &BezierCurveExample::OnKeyEvent );
157 154  
... ...
examples/blocks/blocks-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -251,9 +251,6 @@ public:
251 251 {
252 252 Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
253 253  
254   - // Hide the indicator bar
255   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
256   -
257 254 // Creates a default view with a default tool bar.
258 255 // The view is added to the stage.
259 256 Toolkit::ToolBar toolBar;
... ...
examples/clipping/clipping-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -74,9 +74,6 @@ private:
74 74 */
75 75 void Create( Application& application )
76 76 {
77   - // Hide the indicator bar
78   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
79   -
80 77 // Connect to the stage's key signal to allow Back and Escape to exit.
81 78 Stage stage = Dali::Stage::GetCurrent();
82 79 stage.KeyEventSignal().Connect( this, &ClippingExample::OnKeyEvent );
... ...
examples/contact-cards/contact-cards-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -79,9 +79,6 @@ private:
79 79 */
80 80 void Create( Application& application )
81 81 {
82   - // Hide the indicator bar
83   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
84   -
85 82 // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit.
86 83 Stage stage = Stage::GetCurrent();
87 84 stage.SetBackgroundColor( STAGE_COLOR );
... ...
examples/fpp-game/fpp-game-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -93,10 +93,6 @@ public:
93 93 // The Init signal is received once (only) during the Application lifetime
94 94 void Create( Application& application )
95 95 {
96   - // Disable indicator
97   - Dali::Window winHandle = application.GetWindow();
98   - winHandle.ShowIndicator( Dali::Window::INVISIBLE );
99   -
100 96 // Get a handle to the stage
101 97 mStage = Stage::GetCurrent();
102 98  
... ...
examples/frame-callback/frame-callback-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -77,9 +77,6 @@ private:
77 77 */
78 78 void Create( Application& /* application */ )
79 79 {
80   - // Hide the indicator bar.
81   - mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
82   -
83 80 // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit.
84 81 mStage = Stage::GetCurrent();
85 82 mStage.SetBackgroundColor( Color::WHITE );
... ...
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @e52900d
... ... @@ -177,9 +177,6 @@ public:
177 177 // Get a handle to the stage
178 178 Stage stage = Stage::GetCurrent();
179 179  
180   - // Hide the indicator bar
181   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
182   -
183 180 // Background image:
184 181 Dali::Property::Map backgroundImage;
185 182 backgroundImage.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE );
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -303,9 +303,6 @@ public:
303 303 // Connect to input event signals:
304 304 stage.KeyEventSignal().Connect(this, &ImageScalingIrregularGridController::OnKeyEvent);
305 305  
306   - // Hide the indicator bar
307   - mApplication.GetWindow().ShowIndicator(Dali::Window::INVISIBLE);
308   -
309 306 // Create a default view with a default tool bar:
310 307 mContentLayer = DemoHelper::CreateView( mApplication,
311 308 mView,
... ...
examples/image-view-svg/image-view-svg-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -69,9 +69,6 @@ public:
69 69 Vector2 stageSize = stage.GetSize();
70 70 mActorSize = stageSize/2.f;
71 71  
72   - // Hide the indicator bar
73   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
74   -
75 72 stage.KeyEventSignal().Connect(this, &ImageSvgController::OnKeyEvent);
76 73  
77 74 // Background, for receiving gestures
... ...
examples/line-mesh/line-mesh-example.cpp
  View file @e52900d
... ... @@ -167,9 +167,6 @@ public:
167 167  
168 168 Initialise();
169 169  
170   - // Hide the indicator bar
171   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
172   -
173 170 stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f));
174 171 }
175 172  
... ...
examples/magnifier/magnifier-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -200,9 +200,6 @@ public:
200 200  
201 201 // The Init signal is received once (only) during the Application lifetime
202 202  
203   - // Hide the indicator bar
204   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
205   -
206 203 // Creates a default view with a default tool bar.
207 204 // The view is added to the stage.
208 205 Toolkit::ToolBar toolBar;
... ...
examples/mesh-morph/mesh-morph-example.cpp
  View file @e52900d
... ... @@ -288,9 +288,6 @@ public:
288 288  
289 289 // The Init signal is received once (only) during the Application lifetime
290 290  
291   - // Hide the indicator bar
292   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
293   -
294 291 mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
295 292 mGeometry = CreateGeometry();
296 293 mRenderer = Renderer::New( mGeometry, mShader );
... ...
examples/motion-blur/motion-blur-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -193,7 +193,7 @@ public:
193 193 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
194 194 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
195 195 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
196   - winHandle.ResizedSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized );
  196 + winHandle.ResizeSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized );
197 197  
198 198 // set initial orientation
199 199 Rotate( PORTRAIT );
... ... @@ -231,7 +231,7 @@ public:
231 231 //
232 232 //
233 233  
234   - void OnWindowResized( Window::WindowSize size )
  234 + void OnWindowResized( Window window, Window::WindowSize size )
235 235 {
236 236 Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
237 237 }
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @e52900d
... ... @@ -173,7 +173,7 @@ public:
173 173 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
174 174 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
175 175 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
176   - winHandle.ResizedSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
  176 + winHandle.ResizeSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
177 177  
178 178 // set initial orientation
179 179 Rotate( PORTRAIT );
... ... @@ -204,7 +204,7 @@ public:
204 204 //
205 205 //
206 206  
207   - void OnWindowResized( Window::WindowSize size )
  207 + void OnWindowResized( Window window, Window::WindowSize size )
208 208 {
209 209 Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
210 210 }
... ...
examples/native-image-source/native-image-source-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -130,9 +130,6 @@ public:
130 130 Stage stage = Stage::GetCurrent();
131 131 stage.SetBackgroundColor( Color::WHITE );
132 132  
133   - // Hide the indicator bar
134   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
135   -
136 133 stage.KeyEventSignal().Connect(this, &NativeImageSourceController::OnKeyEvent);
137 134  
138 135 CreateButtonArea();
... ...
examples/page-turn-view/page-turn-view-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -169,7 +169,7 @@ public:
169 169 private:
170 170  
171 171  
172   - void OnWindowResized( Window::WindowSize size );
  172 + void OnWindowResized( Window window, Window::WindowSize size );
173 173  
174 174 void Rotate( DemoOrientation orientation );
175 175  
... ... @@ -210,13 +210,13 @@ void PageTurnExample::OnInit( Application& app )
210 210 window.AddAvailableOrientation( Window::LANDSCAPE );
211 211 window.AddAvailableOrientation( Window::PORTRAIT_INVERSE );
212 212 window.AddAvailableOrientation( Window::LANDSCAPE_INVERSE );
213   - window.ResizedSignal().Connect( this, &PageTurnExample::OnWindowResized );
  213 + window.ResizeSignal().Connect( this, &PageTurnExample::OnWindowResized );
214 214  
215 215 Window::WindowSize size = window.GetSize();
216 216 Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
217 217 }
218 218  
219   -void PageTurnExample::OnWindowResized( Window::WindowSize size )
  219 +void PageTurnExample::OnWindowResized( Window window, Window::WindowSize size )
220 220 {
221 221 Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
222 222 }
... ...
examples/point-mesh/point-mesh-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -149,9 +149,6 @@ public:
149 149  
150 150 // The Init signal is received once (only) during the Application lifetime
151 151  
152   - // Hide the indicator bar
153   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
154   -
155 152 Texture texture0 = DemoHelper::LoadTexture( MATERIAL_SAMPLE );
156 153 Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 );
157 154  
... ...
examples/pre-render-callback/pre-render-callback-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -93,9 +93,6 @@ private:
93 93 mStage.SetBackgroundColor( Color::WHITE );
94 94 mStage.KeyEventSignal().Connect( this, &PreRenderCallbackController::OnKeyEvent );
95 95  
96   - // Hide the indicator bar.
97   - mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
98   -
99 96 // Detect taps on the root layer.
100 97 mTapDetector = TapGestureDetector::New();
101 98 mTapDetector.Attach( mStage.GetRootLayer() );
... ...
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -87,9 +87,6 @@ public:
87 87 Stage stage = Stage::GetCurrent();
88 88 stage.SetBackgroundColor( Color::WHITE );
89 89  
90   - // Hide the indicator bar
91   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
92   -
93 90 //Set up layer to place UI on.
94 91 Layer layer = Layer::New();
95 92 layer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
... ...
examples/ray-marching/ray-marching-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -122,9 +122,6 @@ public:
122 122  
123 123 stage.SetBackgroundColor( Color::YELLOW );
124 124  
125   - // Hide the indicator bar
126   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
127   -
128 125 // Creates a default view with a default tool bar.
129 126 // The view is added to the stage.
130 127 mContentLayer = DemoHelper::CreateView( application,
... ...
examples/renderer-stencil/renderer-stencil-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -115,9 +115,6 @@ private:
115 115 {
116 116 Stage stage = Stage::GetCurrent();
117 117  
118   - // Hide the indicator bar
119   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
120   -
121 118 // Use a gradient visual to render the background gradient.
122 119 Toolkit::Control background = Dali::Toolkit::Control::New();
123 120 background.SetProperty( Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER );
... ...
examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -104,10 +104,6 @@ public:
104 104 // The Init signal is received once (only) during the Application lifetime
105 105 void Create( Application& application )
106 106 {
107   - // Disable indicator
108   - Dali::Window winHandle = application.GetWindow();
109   - winHandle.ShowIndicator( Dali::Window::INVISIBLE );
110   -
111 107 // Get a handle to the stage
112 108 Stage stage = Stage::GetCurrent();
113 109 stage.SetBackgroundColor( Color::BLACK );
... ...
examples/rendering-skybox/rendering-skybox.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -147,11 +147,6 @@ public:
147 147 // The Init signal is received once (only) during the Application lifetime
148 148 void Create( Application& application )
149 149 {
150   - // Disable indicator.
151   - // It avoids reposition the camera to fit with the indicator height.
152   - Dali::Window winHandle = application.GetWindow();
153   - winHandle.ShowIndicator( Dali::Window::INVISIBLE );
154   -
155 150 // Get a handle to the stage
156 151 Stage stage = Stage::GetCurrent();
157 152 stage.SetBackgroundColor( Color::WHITE );
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -167,9 +167,6 @@ public:
167 167 Stage stage = Dali::Stage::GetCurrent();
168 168 stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
169 169  
170   - // Hide the indicator bar
171   - mApplication.GetWindow().ShowIndicator(Dali::Window::INVISIBLE);
172   -
173 170 // Creates a default view with a default tool bar.
174 171 // The view is added to the stage.
175 172 mContentLayer = DemoHelper::CreateView( app,
... ...
examples/simple-visuals-control/simple-visuals-application.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -107,9 +107,6 @@ void SimpleVisualsApplication::Create( Application& application )
107 107 // Connect to key events so can quit application
108 108 stage.KeyEventSignal().Connect(this, &SimpleVisualsApplication::OnKeyEvent);
109 109  
110   - // Hide the indicator bar
111   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
112   -
113 110 // Create a table view to parent the 2 MyControls
114 111 TableView contentLayout = TableView::New( 2, 2 );
115 112 contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout");
... ...
examples/styling/styling-application.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -109,9 +109,6 @@ void StylingApplication::Create( Application& application )
109 109 stage.KeyEventSignal().Connect(this, &StylingApplication::OnKeyEvent);
110 110 stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
111 111  
112   - // Hide the indicator bar
113   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
114   -
115 112 mContentPane = CreateContentPane();
116 113 stage.Add( mContentPane );
117 114 mContentPane.SetProperty( Actor::Property::SIZE, stage.GetSize() );
... ...
examples/text-field/text-field-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -72,9 +72,6 @@ public:
72 72 stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) );
73 73 stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent);
74 74  
75   - // Hide the indicator bar
76   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
77   -
78 75 mButton = CreateFolderButton();
79 76 mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked );
80 77 stage.Add( mButton );
... ...
examples/text-label/text-label-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -633,7 +633,7 @@ public:
633 633 case KEY_ZERO: // fall through
634 634 case KEY_ONE:
635 635 {
636   - mLabel.SetProperty( TextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 );
  636 + mLabel.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 );
637 637 break;
638 638 }
639 639 case KEY_A: // Animate text colour
... ...
examples/textured-mesh/textured-mesh-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -109,9 +109,6 @@ public:
109 109  
110 110 mStageSize = stage.GetSize();
111 111  
112   - // Hide the indicator bar
113   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
114   -
115 112 Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE );
116 113 Texture texture2 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 );
117 114  
... ...
examples/tooltip/tooltip-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -52,9 +52,6 @@ private:
52 52 // The Init signal is received once (only) during the Application lifetime
53 53 void Create( Application& application )
54 54 {
55   - // Hide the indicator bar
56   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
57   -
58 55 // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit.
59 56 Stage stage = Stage::GetCurrent();
60 57 stage.SetBackgroundColor( STAGE_COLOR );
... ...
examples/transitions/transition-application.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -73,9 +73,6 @@ void TransitionApplication::Create( Application& application )
73 73 stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent);
74 74 stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
75 75  
76   - // Hide the indicator bar
77   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
78   -
79 76 // Content panes:
80 77 TableView contentLayout = TableView::New( 3, 1 );
81 78 contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout");
... ...
examples/video-view/video-view-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -59,8 +59,6 @@ class VideoViewController: public ConnectionTracker
59 59  
60 60 void Create( Application& application )
61 61 {
62   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
63   -
64 62 mStageSize = Stage::GetCurrent().GetSize();
65 63  
66 64 mVideoView = Toolkit::VideoView::New();
... ...
examples/visual-transitions/transition-application.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -73,9 +73,6 @@ void TransitionApplication::Create( Application& application )
73 73 stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent);
74 74 stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) );
75 75  
76   - // Hide the indicator bar
77   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
78   -
79 76 // Content panes:
80 77 TableView contentLayout = TableView::New( 4, 1 );
81 78 contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout");
... ...
examples/web-view/web-view-example.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -82,7 +82,7 @@ public:
82 82 mAddressLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, fontSize );
83 83 mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
84 84 mAddressLabel.SetBackgroundColor( Vector4( 0, 0, 0, 0.5f ) );
85   - mAddressLabel.TouchedSignal().Connect( this, &WebViewController::OnTouchText );
  85 + mAddressLabel.TouchSignal().Connect( this, &WebViewController::OnTouchText );
86 86 stage.Add( mAddressLabel );
87 87  
88 88 // Respond to key events
... ... @@ -100,9 +100,9 @@ public:
100 100 mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() );
101 101 }
102 102  
103   - bool OnTouchText( Actor actor, const TouchEvent& event )
  103 + bool OnTouchText( Actor actor, const TouchData& touch )
104 104 {
105   - if ( event.GetPoint( 0 ).state == TouchPoint::Up )
  105 + if ( touch.GetState( 0 ) == PointState::UP )
106 106 {
107 107 std::string url = GetNextUrl();
108 108 mAddressLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, "Waiting" );
... ...
shared/dali-table-view.cpp
  View file @e52900d
1 1 /*
2   - * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -309,8 +309,6 @@ void DaliTableView::Initialize( Application& application )
309 309 unsigned int degrees = 0;
310 310 Rotate( degrees );
311 311  
312   - winHandle.ShowIndicator( Dali::Window::INVISIBLE );
313   -
314 312 // Background animation
315 313 mAnimationTimer = Timer::New( BACKGROUND_ANIMATION_DURATION );
316 314 mAnimationTimer.TickSignal().Connect( this, &DaliTableView::PauseBackgroundAnimation );
... ...
shared/view.h
  View file @e52900d
... ... @@ -2,7 +2,7 @@
2 2 #define DALI_DEMO_HELPER_VIEW_H
3 3  
4 4 /*
5   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  5 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
6 6 *
7 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 8 * you may not use this file except in compliance with the License.
... ... @@ -117,9 +117,6 @@ Dali::Layer CreateView( Dali::Application& application,
117 117 {
118 118 Dali::Stage stage = Dali::Stage::GetCurrent();
119 119  
120   - // Hide the indicator bar
121   - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
122   -
123 120 // Create default View.
124 121 view = Dali::Toolkit::Control::New();
125 122 view.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER );
... ...