#ifndef __DALI_TOOLKIT_INTERNAL_POPUP_H__
#define __DALI_TOOLKIT_INTERNAL_POPUP_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.
-//
+/*
+ * Copyright (c) 2014 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 <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/layer.h>
+#include <dali/public-api/animation/animation.h>
// INTERNAL INCLUDES
-#include <dali/dali.h>
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/popup/popup.h>
#include <dali-toolkit/internal/controls/popup/popup-style-impl.h>
/**
* @copydoc Toolkit::Popup
*/
-class Popup : public ControlImpl
+class Popup : public Control
{
public:
/**
* @copydoc Dali::Toolkit::Popup::OutsideTouchedSignal()
*/
- Toolkit::Popup::TouchedOutsideSignalV2& OutsideTouchedSignal();
+ Toolkit::Popup::TouchedOutsideSignalType& OutsideTouchedSignal();
/**
* @copydoc Dali::Toolkit::Popup::HiddenSignal()
*/
- Toolkit::Popup::HiddenSignalV2& HiddenSignal();
+ Toolkit::Popup::HiddenSignalType& HiddenSignal();
/**
* Connects a callback function with the object's signals.
virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
/**
- * From ControlImpl; called after a child has been added to the owning actor.
+ * From Control; called after a child has been added to the owning actor.
* @param[in] child The child which has been added.
*/
virtual void OnControlChildAdd( Actor& child );
/**
- * @copydoc Toolkit::ControlImpl::OnRelaidOut()
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& size )
+ */
+ virtual void OnControlSizeSet( const Vector3& size );
+
+ /**
+ * @copydoc Control::OnRelayOut()
*/
- virtual void OnRelaidOut( Vector2 size, ActorSizeContainer& container );
+ virtual void OnRelayout( const Vector2& size, ActorSizeContainer& container );
/**
- * @copydoc Toolkit::ControlImpl::OnKeyEvent()
+ * @copydoc Control::OnKeyEvent()
*/
virtual bool OnKeyEvent(const KeyEvent& event);
/**
* @copydoc Control::GetNextKeyboardFocusableActor()
*/
- Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
+ Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled);
private:
LayoutInfo mLayoutInfo; ///< Stores sizes of all popup components.
- Toolkit::Popup::TouchedOutsideSignalV2 mTouchedOutsideSignalV2;
- Toolkit::Popup::HiddenSignalV2 mHiddenSignalV2;
+ Toolkit::Popup::TouchedOutsideSignalType mTouchedOutsideSignal;
+ Toolkit::Popup::HiddenSignalType mHiddenSignal;
Property::Index mPropertyTitle; ///< Property index for Title.
Property::Index mPropertyState; ///< Property index for popup state.