Added default hover event handling in Control

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / controls / control-impl.cpp

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index 74720d0..c7b03dc 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -556,7 +556,7 @@ public:
 
   Toolkit::Control::SizePolicy mWidthPolicy :3;  ///< Stores the width policy. 3 bits covers 8 values
   Toolkit::Control::SizePolicy mHeightPolicy :3; ///< Stores the height policy. 3 bits covers 8 values
 
   Toolkit::Control::SizePolicy mWidthPolicy :3;  ///< Stores the width policy. 3 bits covers 8 values
   Toolkit::Control::SizePolicy mHeightPolicy :3; ///< Stores the height policy. 3 bits covers 8 values

-  ControlBehaviour mFlags :4;             ///< Flags passed in from constructor. Need to increase this size when new enums are added
+  ControlBehaviour mFlags :6;             ///< Flags passed in from constructor. Need to increase this size when new enums are added

   bool mInsideRelayout:1;                 ///< Detect when were in Relayout
   bool mIsKeyboardNavigationSupported:1;  ///< Stores whether keyboard navigation is supported by the control.
   bool mIsKeyboardFocusGroup:1;           ///< Stores whether the control is a focus group.
   bool mInsideRelayout:1;                 ///< Detect when were in Relayout
   bool mIsKeyboardNavigationSupported:1;  ///< Stores whether keyboard navigation is supported by the control.
   bool mIsKeyboardFocusGroup:1;           ///< Stores whether the control is a focus group.


@@ -617,6 +617,9 @@ void Control::Initialize()
     GetImpl( styleManager ).ApplyThemeStyle( GetOwner() );
   }
 
     GetImpl( styleManager ).ApplyThemeStyle( GetOwner() );
   }
 

+  SetRequiresHoverEvents(mImpl->mFlags & REQUIRES_HOVER_EVENTS);
+  SetRequiresMouseWheelEvents(mImpl->mFlags & REQUIRES_MOUSE_WHEEL_EVENTS);
+

   mImpl->mInitialized = true;
 }
 
   mImpl->mInitialized = true;
 }
 


@@ -866,6 +869,11 @@ bool Control::OnTouchEvent(const TouchEvent& event)
   return false; // Do not consume
 }
 
   return false; // Do not consume
 }
 

+bool Control::OnHoverEvent(const HoverEvent& event)
+{
+  return false; // Do not consume
+}
+

 bool Control::OnKeyEvent(const KeyEvent& event)
 {
   return false; // Do not consume
 bool Control::OnKeyEvent(const KeyEvent& event)
 {
   return false; // Do not consume