X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fnavigation-view%2Fnavigation-view-impl.h;h=23b0e6af0915b8a647deeff288f3e7826f011c30;hb=HEAD;hp=d766ebead74f7c768af6ed95da940d35a3a6c37f;hpb=73e02f6f3ea83cbdf3d894a7d067c4dafc0ac54d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h index d766ebe..95bbd12 100644 --- a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h +++ b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -19,24 +19,21 @@ */ // EXTERNAL INCLUDES -#include #include +#include // INTERNAL INCLUDES -#include #include +#include namespace Dali { - namespace Toolkit { - class NavigationView; namespace Internal { - class NavigationBar; /** @@ -48,7 +45,6 @@ class NavigationBar; class NavigationView : public Control { public: - /** * Create an initialized NavigationView. * @return A handle to a newly allocated Dali resource @@ -58,7 +54,7 @@ public: /** * @copydoc Dali::Toolkit::NavigationView::Push() */ - void Push( Actor& actor ); + void Push(Actor& actor); /** * @copydoc Dali::Toolkit::NavigationView::Pop() @@ -74,13 +70,16 @@ public: */ //static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& properties ); - private: // override functions from Control + /** + * @copydoc Constrol::OnInitialize + */ + virtual void OnInitialize() override; /** * @copydoc Control::OnSceneConnection( int depth ) */ - void OnSceneConnection( int depth ) override; + void OnSceneConnection(int depth) override; /** * @copydoc Control::OnRelayout() @@ -88,7 +87,6 @@ private: // override functions from Control //virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); protected: - /** * Constructor. * It initializes the NavigationView members @@ -101,7 +99,6 @@ protected: virtual ~NavigationView(); private: - // Undefined NavigationView(const NavigationView&); @@ -109,30 +106,29 @@ private: NavigationView& operator=(const NavigationView& rhs); private: - - std::vector< Actor > mContentStack; + std::vector mContentStack; }; } // namespace Internal // Helpers for public-api forwarding methods -inline Toolkit::Internal::NavigationView& GetImpl( Toolkit::NavigationView& navigationView ) +inline Toolkit::Internal::NavigationView& GetImpl(Toolkit::NavigationView& navigationView) { - DALI_ASSERT_ALWAYS( navigationView ); + DALI_ASSERT_ALWAYS(navigationView); Dali::RefObject& handle = navigationView.GetImplementation(); - return static_cast( handle ); + return static_cast(handle); } -inline const Toolkit::Internal::NavigationView& GetImpl( const Toolkit::NavigationView& navigationView ) +inline const Toolkit::Internal::NavigationView& GetImpl(const Toolkit::NavigationView& navigationView) { - DALI_ASSERT_ALWAYS( navigationView ); + DALI_ASSERT_ALWAYS(navigationView); const Dali::RefObject& handle = navigationView.GetImplementation(); - return static_cast( handle ); + return static_cast(handle); } } // namespace Toolkit