Merge "Add TOUCH_FOCUSABLE property" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / control / control-data-impl.h

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index d944114..96290b7 100644 (file)
--- a/dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/dali-toolkit/internal/controls/control/control-data-impl.h
@@ -69,6 +69,8 @@ typedef Dali::OwnerContainer<RegisteredVisual*> RegisteredVisualContainer;
  */
 class Control::Impl : public ConnectionTracker, public Visual::EventObserver
 {
+  friend class Toolkit::DevelControl::AccessibleImpl;
+
 public:
   /**
    * @brief Retrieves the implementation of the internal control class.
@@ -391,6 +393,18 @@ public:
    */
   Dali::Property GetVisualProperty(Dali::Property::Index index, Dali::Property::Key visualPropertyKey);
 
+  /**
+   * @brief Make visual transition from source control to this control about specific Property::Index
+   * If both of source and this control have Property::Index property, than create animation between them.
+   *
+   * @param[in] animation Return animation from source to this control.
+   * @param[in] source Source control to be used property animation.
+   * @param[in] visualIndex Property::Index to make animation.
+   * @param[in] alphaFunction alpha function of the animation.
+   * @param[in] timePeriod time period of the animation.
+   */
+  void MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index visualIndex, AlphaFunction alphaFunction, TimePeriod timePeriod);
+
 private:
   /**
    * Used as an alternative to boolean so that it is obvious whether a visual is enabled/disabled.
@@ -487,7 +501,6 @@ public:
   Dali::Accessibility::Role mAccessibilityRole = Dali::Accessibility::Role::UNKNOWN;
 
   std::vector<std::vector<Accessibility::Address>> mAccessibilityRelations;
-  bool                                             mAccessibilityAnimated = false;
 
   // Gesture Detection
   PinchGestureDetector     mPinchGestureDetector;
@@ -541,61 +554,8 @@ public:
   static Dali::Accessibility::Accessible* GetAccessibilityObject(Dali::Actor actor);
   Dali::Accessibility::Accessible*        GetAccessibilityObject();
 
-  void AccessibilityRegister();
-  void AccessibilityDeregister();
-
-  struct AccessibleImpl : public virtual Dali::Accessibility::Accessible,
-                          public virtual Dali::Accessibility::Component,
-                          public virtual Dali::Accessibility::Collection,
-                          public virtual Dali::Accessibility::Action
-  {
-    Dali::Actor self;
-    bool        modal = false, root = false;
-
-    AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal = false);
-
-    std::string                         GetName() override;
-    virtual std::string                 GetNameRaw();
-    std::string                         GetDescription() override;
-    virtual std::string                 GetDescriptionRaw();
-    Dali::Accessibility::Accessible*    GetParent() override;
-    size_t                              GetChildCount() override;
-    Dali::Accessibility::Accessible*    GetChildAtIndex(size_t index) override;
-    size_t                              GetIndexInParent() override;
-    Dali::Accessibility::Role           GetRole() override;
-    Dali::Accessibility::States         GetStates() override;
-    Dali::Accessibility::Attributes     GetAttributes() override;
-    Dali::Rect<>                        GetExtents(Dali::Accessibility::CoordType ctype) override;
-    Dali::Accessibility::ComponentLayer GetLayer() override;
-    int16_t                             GetMdiZOrder() override;
-    bool                                GrabFocus() override;
-    double                              GetAlpha() override;
-    bool                                GrabHighlight() override;
-    bool                                ClearHighlight() override;
-
-    std::string                                GetActionName(size_t index) override;
-    std::string                                GetLocalizedActionName(size_t index) override;
-    std::string                                GetActionDescription(size_t index) override;
-    size_t                                     GetActionCount() override;
-    std::string                                GetActionKeyBinding(size_t index) override;
-    bool                                       DoAction(size_t index) override;
-    bool                                       DoAction(const std::string& name) override;
-    bool                                       DoGesture(const Dali::Accessibility::GestureInfo& gestureInfo) override;
-    std::vector<Dali::Accessibility::Relation> GetRelationSet() override;
-
-    virtual Dali::Accessibility::States CalculateStates();
-    virtual void                        EnsureChildVisible(Actor child);
-    virtual void                        EnsureSelfVisible();
-    virtual Property::Index             GetNamePropertyIndex();
-    virtual Property::Index             GetDescriptionPropertyIndex();
-  };
-
   std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Actor)> accessibilityConstructor;
   std::unique_ptr<Dali::Accessibility::Accessible>                       accessibilityObject;
-  Dali::PropertyNotification                                             accessibilityNotificationPosition, accessibilityNotificationSize, accessibilityNotificationCulled;
-  bool                                                                   accessibilityNotificationSet = false;
-  static void                                                            PositionOrSizeChangedCallback(PropertyNotification&);
-  static void                                                            CulledChangedCallback(PropertyNotification&);
 };
 
 } // namespace Internal