Merge "[3.0] Added sibling order property to Actor" into tizen_3.0

[platform/core/uifw/dali-core.git] / dali / integration-api / core.h

diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h
index c70edef..19693d8 100644 (file)
--- a/dali/integration-api/core.h
+++ b/dali/integration-api/core.h
@@ -53,13 +53,12 @@ namespace KeepUpdating
 {
 enum Reasons
 {
-  NOT_REQUESTED           = 0x00, ///< Zero means that no further updates are required
-  STAGE_KEEP_RENDERING    = 0x01, ///<  - Stage::KeepRendering() is being used
-  ANIMATIONS_RUNNING      = 0x02, ///< - Animations are ongoing
-  DYNAMICS_CHANGED        = 0x04, ///< - A dynamics simulation is running
-  LOADING_RESOURCES       = 0x08, ///< - Resources are being loaded
-  MONITORING_PERFORMANCE  = 0x10, ///< - The --enable-performance-monitor option is being used
-  RENDER_TASK_SYNC        = 0x20  ///< - A render task is waiting for render sync
+  NOT_REQUESTED           = 0,    ///< Zero means that no further updates are required
+  STAGE_KEEP_RENDERING    = 1<<1, ///<  - Stage::KeepRendering() is being used
+  ANIMATIONS_RUNNING      = 1<<2, ///< - Animations are ongoing
+  LOADING_RESOURCES       = 1<<3, ///< - Resources are being loaded
+  MONITORING_PERFORMANCE  = 1<<4, ///< - The --enable-performance-monitor option is being used
+  RENDER_TASK_SYNC        = 1<<5  ///< - A render task is waiting for render sync
 };
 }
 
@@ -120,8 +119,7 @@ public:
    * Constructor
    */
   RenderStatus()
-  : needsUpdate(false),
-    hasRendered(false)
+  : needsUpdate(false)
   {
   }
 
@@ -138,21 +136,9 @@ public:
    */
   bool NeedsUpdate() { return needsUpdate; }
 
-  /**
-   * Set whether there were new render instructions.
-   */
-  void SetHasRendered(bool rendered) { hasRendered = rendered; }
-
-  /**
-   * Query whether there were new render instructions.
-   * @return true if there were render instructions
-   */
-  bool HasRendered() { return hasRendered; }
-
 private:
 
   bool needsUpdate;
-  bool hasRendered;
 };
 
 /**
@@ -269,6 +255,15 @@ public:
    */
   void SurfaceResized(unsigned int width, unsigned int height);
 
+  /**
+   * Notify the Core about the top margin size.
+   * Available stage size is reduced by this size.
+   * The stage is located below the size at the top of the display
+   * It is mainly useful for indicator in mobile device
+   * @param[in] margin margin size
+   */
+  void SetTopMargin( unsigned int margin );
+
   // Core setters
 
   /**
@@ -323,15 +318,6 @@ public:
   void ProcessEvents();
 
   /**
-   * Update external raw touch data in core.
-   * The core will use the touch data to generate Dali Touch/Gesture events for applications to use
-   * in the update thread.
-   * @param[in] touch The raw touch data.
-   * @note This can be called from either the event thread OR a dedicated touch thread.
-   */
-  void UpdateTouchData(const TouchData& touch);
-
-  /**
    * The Core::Update() method prepares a frame for rendering. This method determines how many frames
    * may be prepared, ahead of the rendering.
    * For example if the maximum update count is 2, then Core::Update() for frame N+1 may be processed