From 6bccceebe41980e61f5d5d6956ab76b5a37653a0 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Thu, 2 Jul 2020 10:52:34 +0100 Subject: [PATCH] Remove non-touch related deprecated APIs Change-Id: I34809e7d42898a74ccb723c16d519a69aa6b2686 --- examples/animated-shapes/animated-shapes-example.cpp | 5 +---- examples/bezier-curve/bezier-curve-example.cpp | 5 +---- examples/blocks/blocks-example.cpp | 5 +---- examples/clipping/clipping-example.cpp | 5 +---- examples/contact-cards/contact-cards-example.cpp | 5 +---- examples/fpp-game/fpp-game-example.cpp | 6 +----- examples/frame-callback/frame-callback-example.cpp | 5 +---- .../image-scaling-and-filtering-example.cpp | 3 --- .../image-scaling-irregular-grid-example.cpp | 5 +---- examples/image-view-svg/image-view-svg-example.cpp | 5 +---- examples/line-mesh/line-mesh-example.cpp | 3 --- examples/magnifier/magnifier-example.cpp | 5 +---- examples/mesh-morph/mesh-morph-example.cpp | 3 --- examples/motion-blur/motion-blur-example.cpp | 6 +++--- examples/motion-stretch/motion-stretch-example.cpp | 4 ++-- examples/native-image-source/native-image-source-example.cpp | 5 +---- examples/page-turn-view/page-turn-view-example.cpp | 8 ++++---- examples/point-mesh/point-mesh-example.cpp | 5 +---- examples/pre-render-callback/pre-render-callback-example.cpp | 5 +---- examples/primitive-shapes/primitive-shapes-example.cpp | 5 +---- examples/ray-marching/ray-marching-example.cpp | 5 +---- examples/renderer-stencil/renderer-stencil-example.cpp | 5 +---- examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp | 6 +----- examples/rendering-skybox/rendering-skybox.cpp | 7 +------ examples/scroll-view/scroll-view-example.cpp | 5 +---- examples/simple-visuals-control/simple-visuals-application.cpp | 5 +---- examples/styling/styling-application.cpp | 5 +---- examples/text-field/text-field-example.cpp | 5 +---- examples/text-label/text-label-example.cpp | 4 ++-- examples/textured-mesh/textured-mesh-example.cpp | 5 +---- examples/tooltip/tooltip-example.cpp | 5 +---- examples/transitions/transition-application.cpp | 5 +---- examples/video-view/video-view-example.cpp | 4 +--- examples/visual-transitions/transition-application.cpp | 5 +---- examples/web-view/web-view-example.cpp | 8 ++++---- shared/dali-table-view.cpp | 4 +--- shared/view.h | 5 +---- 37 files changed, 44 insertions(+), 142 deletions(-) diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp index 2960f47..66828d1 100644 --- a/examples/animated-shapes/animated-shapes-example.cpp +++ b/examples/animated-shapes/animated-shapes-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -103,9 +103,6 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - Stage stage = Stage::GetCurrent(); // Creates the background gradient diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp index b3e5a16..717ee66 100644 --- a/examples/bezier-curve/bezier-curve-example.cpp +++ b/examples/bezier-curve/bezier-curve-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. @@ -149,9 +149,6 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - Stage stage = Stage::GetCurrent(); stage.KeyEventSignal().Connect( this, &BezierCurveExample::OnKeyEvent ); diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index 8fc8424..9d5f33b 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -251,9 +251,6 @@ public: { Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Creates a default view with a default tool bar. // The view is added to the stage. Toolkit::ToolBar toolBar; diff --git a/examples/clipping/clipping-example.cpp b/examples/clipping/clipping-example.cpp index ab43a07..6eb1ee2 100644 --- a/examples/clipping/clipping-example.cpp +++ b/examples/clipping/clipping-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -74,9 +74,6 @@ private: */ void Create( Application& application ) { - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Connect to the stage's key signal to allow Back and Escape to exit. Stage stage = Dali::Stage::GetCurrent(); stage.KeyEventSignal().Connect( this, &ClippingExample::OnKeyEvent ); diff --git a/examples/contact-cards/contact-cards-example.cpp b/examples/contact-cards/contact-cards-example.cpp index a0967a1..d48bff5 100644 --- a/examples/contact-cards/contact-cards-example.cpp +++ b/examples/contact-cards/contact-cards-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -79,9 +79,6 @@ private: */ void Create( Application& application ) { - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit. Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor( STAGE_COLOR ); diff --git a/examples/fpp-game/fpp-game-example.cpp b/examples/fpp-game/fpp-game-example.cpp index 517cf69..a3d3258 100644 --- a/examples/fpp-game/fpp-game-example.cpp +++ b/examples/fpp-game/fpp-game-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -93,10 +93,6 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Disable indicator - Dali::Window winHandle = application.GetWindow(); - winHandle.ShowIndicator( Dali::Window::INVISIBLE ); - // Get a handle to the stage mStage = Stage::GetCurrent(); diff --git a/examples/frame-callback/frame-callback-example.cpp b/examples/frame-callback/frame-callback-example.cpp index a52ee11..d780ff8 100644 --- a/examples/frame-callback/frame-callback-example.cpp +++ b/examples/frame-callback/frame-callback-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -77,9 +77,6 @@ private: */ void Create( Application& /* application */ ) { - // Hide the indicator bar. - mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit. mStage = Stage::GetCurrent(); mStage.SetBackgroundColor( Color::WHITE ); diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index a70b2db..1efe904 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -177,9 +177,6 @@ public: // Get a handle to the stage Stage stage = Stage::GetCurrent(); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Background image: Dali::Property::Map backgroundImage; backgroundImage.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE ); diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index 2e95068..3b85542 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-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. @@ -303,9 +303,6 @@ public: // Connect to input event signals: stage.KeyEventSignal().Connect(this, &ImageScalingIrregularGridController::OnKeyEvent); - // Hide the indicator bar - mApplication.GetWindow().ShowIndicator(Dali::Window::INVISIBLE); - // Create a default view with a default tool bar: mContentLayer = DemoHelper::CreateView( mApplication, mView, diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp index b62b6fe..30c6ca7 100644 --- a/examples/image-view-svg/image-view-svg-example.cpp +++ b/examples/image-view-svg/image-view-svg-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -69,9 +69,6 @@ public: Vector2 stageSize = stage.GetSize(); mActorSize = stageSize/2.f; - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - stage.KeyEventSignal().Connect(this, &ImageSvgController::OnKeyEvent); // Background, for receiving gestures diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp index 99f3009..3d7b25f 100644 --- a/examples/line-mesh/line-mesh-example.cpp +++ b/examples/line-mesh/line-mesh-example.cpp @@ -167,9 +167,6 @@ public: Initialise(); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - stage.SetBackgroundColor(Vector4(0.0f, 0.2f, 0.2f, 1.0f)); } diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index 0f0f08f..35a6b47 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -200,9 +200,6 @@ public: // The Init signal is received once (only) during the Application lifetime - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Creates a default view with a default tool bar. // The view is added to the stage. Toolkit::ToolBar toolBar; diff --git a/examples/mesh-morph/mesh-morph-example.cpp b/examples/mesh-morph/mesh-morph-example.cpp index 655545a..7b73c23 100644 --- a/examples/mesh-morph/mesh-morph-example.cpp +++ b/examples/mesh-morph/mesh-morph-example.cpp @@ -288,9 +288,6 @@ public: // The Init signal is received once (only) during the Application lifetime - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - mShader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); mGeometry = CreateGeometry(); mRenderer = Renderer::New( mGeometry, mShader ); diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp index 6fa3778..f1b8d26 100644 --- a/examples/motion-blur/motion-blur-example.cpp +++ b/examples/motion-blur/motion-blur-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. @@ -193,7 +193,7 @@ public: winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); - winHandle.ResizedSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized ); + winHandle.ResizeSignal().Connect( this, &MotionBlurExampleApp::OnWindowResized ); // set initial orientation Rotate( PORTRAIT ); @@ -231,7 +231,7 @@ public: // // - void OnWindowResized( Window::WindowSize size ) + void OnWindowResized( Window window, Window::WindowSize size ) { Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT ); } diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp index c579e5a..9cc0d16 100644 --- a/examples/motion-stretch/motion-stretch-example.cpp +++ b/examples/motion-stretch/motion-stretch-example.cpp @@ -173,7 +173,7 @@ public: winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); - winHandle.ResizedSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized ); + winHandle.ResizeSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized ); // set initial orientation Rotate( PORTRAIT ); @@ -204,7 +204,7 @@ public: // // - void OnWindowResized( Window::WindowSize size ) + void OnWindowResized( Window window, Window::WindowSize size ) { Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT ); } diff --git a/examples/native-image-source/native-image-source-example.cpp b/examples/native-image-source/native-image-source-example.cpp index aa91c0d..a389a27 100644 --- a/examples/native-image-source/native-image-source-example.cpp +++ b/examples/native-image-source/native-image-source-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -130,9 +130,6 @@ public: Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor( Color::WHITE ); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - stage.KeyEventSignal().Connect(this, &NativeImageSourceController::OnKeyEvent); CreateButtonArea(); diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp index c6c99a8..3e84f98 100644 --- a/examples/page-turn-view/page-turn-view-example.cpp +++ b/examples/page-turn-view/page-turn-view-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. @@ -169,7 +169,7 @@ public: private: - void OnWindowResized( Window::WindowSize size ); + void OnWindowResized( Window window, Window::WindowSize size ); void Rotate( DemoOrientation orientation ); @@ -210,13 +210,13 @@ void PageTurnExample::OnInit( Application& app ) window.AddAvailableOrientation( Window::LANDSCAPE ); window.AddAvailableOrientation( Window::PORTRAIT_INVERSE ); window.AddAvailableOrientation( Window::LANDSCAPE_INVERSE ); - window.ResizedSignal().Connect( this, &PageTurnExample::OnWindowResized ); + window.ResizeSignal().Connect( this, &PageTurnExample::OnWindowResized ); Window::WindowSize size = window.GetSize(); Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT ); } -void PageTurnExample::OnWindowResized( Window::WindowSize size ) +void PageTurnExample::OnWindowResized( Window window, Window::WindowSize size ) { Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT ); } diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp index 126b9d6..6495470 100644 --- a/examples/point-mesh/point-mesh-example.cpp +++ b/examples/point-mesh/point-mesh-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -149,9 +149,6 @@ public: // The Init signal is received once (only) during the Application lifetime - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - Texture texture0 = DemoHelper::LoadTexture( MATERIAL_SAMPLE ); Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 ); diff --git a/examples/pre-render-callback/pre-render-callback-example.cpp b/examples/pre-render-callback/pre-render-callback-example.cpp index 8143183..94d431a 100644 --- a/examples/pre-render-callback/pre-render-callback-example.cpp +++ b/examples/pre-render-callback/pre-render-callback-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. @@ -93,9 +93,6 @@ private: mStage.SetBackgroundColor( Color::WHITE ); mStage.KeyEventSignal().Connect( this, &PreRenderCallbackController::OnKeyEvent ); - // Hide the indicator bar. - mApplication.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Detect taps on the root layer. mTapDetector = TapGestureDetector::New(); mTapDetector.Attach( mStage.GetRootLayer() ); diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp index 361e976..af7f6e8 100644 --- a/examples/primitive-shapes/primitive-shapes-example.cpp +++ b/examples/primitive-shapes/primitive-shapes-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. @@ -87,9 +87,6 @@ public: Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor( Color::WHITE ); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - //Set up layer to place UI on. Layer layer = Layer::New(); layer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); diff --git a/examples/ray-marching/ray-marching-example.cpp b/examples/ray-marching/ray-marching-example.cpp index 39f97df..3c60bf5 100644 --- a/examples/ray-marching/ray-marching-example.cpp +++ b/examples/ray-marching/ray-marching-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -122,9 +122,6 @@ public: stage.SetBackgroundColor( Color::YELLOW ); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Creates a default view with a default tool bar. // The view is added to the stage. mContentLayer = DemoHelper::CreateView( application, diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp index e6732fa..5f73dea 100644 --- a/examples/renderer-stencil/renderer-stencil-example.cpp +++ b/examples/renderer-stencil/renderer-stencil-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -115,9 +115,6 @@ private: { Stage stage = Stage::GetCurrent(); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Use a gradient visual to render the background gradient. Toolkit::Control background = Dali::Toolkit::Control::New(); background.SetProperty( Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER ); diff --git a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp index 17a181d..0805c6b 100644 --- a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp +++ b/examples/rendering-basic-pbr/rendering-basic-pbr-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. @@ -104,10 +104,6 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Disable indicator - Dali::Window winHandle = application.GetWindow(); - winHandle.ShowIndicator( Dali::Window::INVISIBLE ); - // Get a handle to the stage Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor( Color::BLACK ); diff --git a/examples/rendering-skybox/rendering-skybox.cpp b/examples/rendering-skybox/rendering-skybox.cpp index 670d5f3..b9b2e50 100644 --- a/examples/rendering-skybox/rendering-skybox.cpp +++ b/examples/rendering-skybox/rendering-skybox.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -147,11 +147,6 @@ public: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Disable indicator. - // It avoids reposition the camera to fit with the indicator height. - Dali::Window winHandle = application.GetWindow(); - winHandle.ShowIndicator( Dali::Window::INVISIBLE ); - // Get a handle to the stage Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor( Color::WHITE ); diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index 8a2a81d..301e6c8 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-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. @@ -167,9 +167,6 @@ public: Stage stage = Dali::Stage::GetCurrent(); stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent); - // Hide the indicator bar - mApplication.GetWindow().ShowIndicator(Dali::Window::INVISIBLE); - // Creates a default view with a default tool bar. // The view is added to the stage. mContentLayer = DemoHelper::CreateView( app, diff --git a/examples/simple-visuals-control/simple-visuals-application.cpp b/examples/simple-visuals-control/simple-visuals-application.cpp index 73e4b4c..a687bd9 100644 --- a/examples/simple-visuals-control/simple-visuals-application.cpp +++ b/examples/simple-visuals-control/simple-visuals-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -107,9 +107,6 @@ void SimpleVisualsApplication::Create( Application& application ) // Connect to key events so can quit application stage.KeyEventSignal().Connect(this, &SimpleVisualsApplication::OnKeyEvent); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Create a table view to parent the 2 MyControls TableView contentLayout = TableView::New( 2, 2 ); contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout"); diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp index def54fb..caae713 100644 --- a/examples/styling/styling-application.cpp +++ b/examples/styling/styling-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -109,9 +109,6 @@ void StylingApplication::Create( Application& application ) stage.KeyEventSignal().Connect(this, &StylingApplication::OnKeyEvent); stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) ); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - mContentPane = CreateContentPane(); stage.Add( mContentPane ); mContentPane.SetProperty( Actor::Property::SIZE, stage.GetSize() ); diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 3a7559c..12fbae9 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-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. @@ -72,9 +72,6 @@ public: stage.SetBackgroundColor( Vector4( 0.04f, 0.345f, 0.392f, 1.0f ) ); stage.KeyEventSignal().Connect(this, &TextFieldExample::OnKeyEvent); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - mButton = CreateFolderButton(); mButton.ClickedSignal().Connect( this, &TextFieldExample::OnButtonClicked ); stage.Add( mButton ); diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index f77102f..8d853af 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-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. @@ -633,7 +633,7 @@ public: case KEY_ZERO: // fall through case KEY_ONE: { - mLabel.SetProperty( TextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 ); + mLabel.SetProperty( DevelTextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 ); break; } case KEY_A: // Animate text colour diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index 99f189e..6ee57f1 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -109,9 +109,6 @@ public: mStageSize = stage.GetSize(); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - Texture texture1 = DemoHelper::LoadTexture( MATERIAL_SAMPLE ); Texture texture2 = DemoHelper::LoadTexture( MATERIAL_SAMPLE2 ); diff --git a/examples/tooltip/tooltip-example.cpp b/examples/tooltip/tooltip-example.cpp index 36f436e..de3ed42 100644 --- a/examples/tooltip/tooltip-example.cpp +++ b/examples/tooltip/tooltip-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. @@ -52,9 +52,6 @@ private: // The Init signal is received once (only) during the Application lifetime void Create( Application& application ) { - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Set the stage background color and connect to the stage's key signal to allow Back and Escape to exit. Stage stage = Stage::GetCurrent(); stage.SetBackgroundColor( STAGE_COLOR ); diff --git a/examples/transitions/transition-application.cpp b/examples/transitions/transition-application.cpp index 08f9687..160a02d 100644 --- a/examples/transitions/transition-application.cpp +++ b/examples/transitions/transition-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -73,9 +73,6 @@ void TransitionApplication::Create( Application& application ) stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent); stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) ); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Content panes: TableView contentLayout = TableView::New( 3, 1 ); contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout"); diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp index a90aafa..d648e5c 100644 --- a/examples/video-view/video-view-example.cpp +++ b/examples/video-view/video-view-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. @@ -59,8 +59,6 @@ class VideoViewController: public ConnectionTracker void Create( Application& application ) { - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - mStageSize = Stage::GetCurrent().GetSize(); mVideoView = Toolkit::VideoView::New(); diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp index 39d8711..b50e676 100644 --- a/examples/visual-transitions/transition-application.cpp +++ b/examples/visual-transitions/transition-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -73,9 +73,6 @@ void TransitionApplication::Create( Application& application ) stage.KeyEventSignal().Connect(this, &TransitionApplication::OnKeyEvent); stage.SetBackgroundColor( Vector4( 0.1f, 0.1f, 0.1f, 1.0f ) ); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Content panes: TableView contentLayout = TableView::New( 4, 1 ); contentLayout.SetProperty( Dali::Actor::Property::NAME,"ContentLayout"); diff --git a/examples/web-view/web-view-example.cpp b/examples/web-view/web-view-example.cpp index 6a54a2c..2ff41df 100644 --- a/examples/web-view/web-view-example.cpp +++ b/examples/web-view/web-view-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 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. @@ -82,7 +82,7 @@ public: mAddressLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, fontSize ); mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); mAddressLabel.SetBackgroundColor( Vector4( 0, 0, 0, 0.5f ) ); - mAddressLabel.TouchedSignal().Connect( this, &WebViewController::OnTouchText ); + mAddressLabel.TouchSignal().Connect( this, &WebViewController::OnTouchText ); stage.Add( mAddressLabel ); // Respond to key events @@ -100,9 +100,9 @@ public: mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, url.c_str() ); } - bool OnTouchText( Actor actor, const TouchEvent& event ) + bool OnTouchText( Actor actor, const TouchData& touch ) { - if ( event.GetPoint( 0 ).state == TouchPoint::Up ) + if ( touch.GetState( 0 ) == PointState::UP ) { std::string url = GetNextUrl(); mAddressLabel.SetProperty(Toolkit::TextLabel::Property::TEXT, "Waiting" ); diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp index be6a1d4..c62c84c 100644 --- a/shared/dali-table-view.cpp +++ b/shared/dali-table-view.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. @@ -309,8 +309,6 @@ void DaliTableView::Initialize( Application& application ) unsigned int degrees = 0; Rotate( degrees ); - winHandle.ShowIndicator( Dali::Window::INVISIBLE ); - // Background animation mAnimationTimer = Timer::New( BACKGROUND_ANIMATION_DURATION ); mAnimationTimer.TickSignal().Connect( this, &DaliTableView::PauseBackgroundAnimation ); diff --git a/shared/view.h b/shared/view.h index e27e374..6c36bee 100644 --- a/shared/view.h +++ b/shared/view.h @@ -2,7 +2,7 @@ #define DALI_DEMO_HELPER_VIEW_H /* - * Copyright (c) 2014 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. @@ -117,9 +117,6 @@ Dali::Layer CreateView( Dali::Application& application, { Dali::Stage stage = Dali::Stage::GetCurrent(); - // Hide the indicator bar - application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE ); - // Create default View. view = Dali::Toolkit::Control::New(); view.SetProperty( Dali::Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER ); -- 2.7.4