X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.h;h=1039ea03e845d50bda23dfe0eb86251a236c9683;hp=9a58aecdf052a02d318685c368a22a1e6a4d05ea;hb=HEAD;hpb=e2eda444afbe82e9591fe198eef339227f90a616 diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h index 9a58aec..1039ea0 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h @@ -1,48 +1,46 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__ -#define __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__ - -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#include +#ifndef DALI_TOOLKIT_INTERNAL_TOOL_BAR_H +#define DALI_TOOLKIT_INTERNAL_TOOL_BAR_H + +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +// EXTERNAL INCLUDES +#include // INTERNAL INCLUDES +#include +#include #include -#include -#include namespace Dali { - namespace Toolkit { - class ToolBar; namespace Internal { - /** * ToolBar is a control to create a tool bar. * @see Dali::Toolkit::ToolBar for more details. */ -class ToolBar : public ControlImpl +class ToolBar : public Control { public: - /** * Create an initialized ToolBar. * @return A handle to a newly allocated Dali resource. @@ -50,41 +48,28 @@ public: static Toolkit::ToolBar New(); /** - * @copydoc Dali::Toolkit::View::SetBackground() + * @copydoc Dali::Toolkit::ToolBar::AddControl() */ - void SetBackground( Actor background ); + void AddControl(Dali::Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding); /** - * @copydoc Dali::Toolkit::View::AddControl() + * @copydoc Dali::Toolkit::ToolBar::RemoveControl() */ - void AddControl( Dali::Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding ); - - /** - * @copydoc Dali::Toolkit::View::RemoveControl() - */ - void RemoveControl( Dali::Actor control ); - -private: // From ControlImpl + void RemoveControl(Dali::Actor control); +private: // From Control /** * @copydoc Toolkit::Control::OnInitialize() */ - virtual void OnInitialize(); + void OnInitialize() override; /** * Adds a control using some default values (the control uses 10% of the tool bar space and is placed on the left group). * @param child The control to be added. * - * @see Toolkit::ControlImpl::OnControlChildAdd() + * @see Control::OnChildAdd() */ - virtual void OnControlChildAdd(Actor& child); - - /** - * Called when the tool-bar is relaid out. - * @param[in] size The size allocated. - * @param[in/out] container the container to put actors not handled. - */ - virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container ); + void OnChildAdd(Actor& child) override; private: /** @@ -95,8 +80,8 @@ private: /** * Constructor, sets the lock boolean */ - Lock( bool& lock ) - : mLock( lock ) + Lock(bool& lock) + : mLock(lock) { mLock = true; } @@ -108,6 +93,7 @@ private: { mLock = false; } + private: bool& mLock; }; @@ -135,34 +121,33 @@ private: float mAccumulatedRelativeSpace; ///< Stores the total percentage space used by controls. bool mInitializing; ///< Allows the use of Actor's API to add controls. - std::map mControls; ///< Stores a relationship between controls and their alignments used to place them inside the table view. + std::map mControls; ///< Stores a relationship between controls and their alignments used to place them inside the table view. }; } // namespace Internal - // Helpers for public-api forwarding methods -inline Toolkit::Internal::ToolBar& GetImpl( Toolkit::ToolBar& toolBar ) +inline Toolkit::Internal::ToolBar& GetImpl(Toolkit::ToolBar& toolBar) { - DALI_ASSERT_ALWAYS( toolBar ); + DALI_ASSERT_ALWAYS(toolBar); Dali::RefObject& handle = toolBar.GetImplementation(); - return static_cast( handle ); + return static_cast(handle); } -inline const Toolkit::Internal::ToolBar& GetImpl( const Toolkit::ToolBar& toolBar ) +inline const Toolkit::Internal::ToolBar& GetImpl(const Toolkit::ToolBar& toolBar) { - DALI_ASSERT_ALWAYS( toolBar ); + DALI_ASSERT_ALWAYS(toolBar); const Dali::RefObject& handle = toolBar.GetImplementation(); - return static_cast( handle ); + return static_cast(handle); } } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__ +#endif // DALI_TOOLKIT_INTERNAL_TOOL_BAR_H