X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fpopup%2Fpopup.h;h=b0bf93d17afb2a625b5e387f583c95d20eb1e15c;hb=f3c7e52f300fc2f6d07bcbd75ad3b992e19083f5;hp=40b4df361c16a15eeee4253cddd6ef17510c03a3;hpb=91b8f5bbaa7d68f5ca8fc94287b8c181a10ba894;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/popup/popup.h b/dali-toolkit/devel-api/controls/popup/popup.h index 40b4df3..b0bf93d 100644 --- a/dali-toolkit/devel-api/controls/popup/popup.h +++ b/dali-toolkit/devel-api/controls/popup/popup.h @@ -46,7 +46,7 @@ class Popup; * Signals * | %Signal Name | Method | * |-------------------|------------------------------| - * | touched-outside | @ref OutsideTouchedSignal() | + * | touchedOutside | @ref OutsideTouchedSignal() | * | showing | @ref ShowingSignal() | * | shown | @ref ShownSignal() | * | hiding | @ref HidingSignal() | @@ -76,23 +76,23 @@ public: TITLE = PROPERTY_START_INDEX, ///< name "title", type Property::Map CONTENT, ///< name "content", type Property::Map FOOTER, ///< name "footer", type Property::Map - DISPLAY_STATE, ///< name "display-state", type std::string - TOUCH_TRANSPARENT, ///< name "touch-transparent", type bool - TAIL_VISIBILITY, ///< name "tail-visibility", type bool - TAIL_POSITION, ///< name "tail-position", type Vector3 - CONTEXTUAL_MODE, ///< name "contextual-mode", type std::string - ANIMATION_DURATION, ///< name "animation-duration", type float - ANIMATION_MODE, ///< name "animation-mode", type std::string - ENTRY_ANIMATION, ///< name "entry-animation", type Property::Map - EXIT_ANIMATION, ///< name "exit-animation", type Property::Map - AUTO_HIDE_DELAY, ///< name "auto-hide-delay", type int - BACKING_ENABLED, ///< name "backing-enabled", type bool - BACKING_COLOR, ///< name "backing-color", type Vector4 - POPUP_BACKGROUND_IMAGE, ///< name "popup-background-image", type std::string - TAIL_UP_IMAGE, ///< name "tail-up-image", type std::string - TAIL_DOWN_IMAGE, ///< name "tail-down-image", type std::string - TAIL_LEFT_IMAGE, ///< name "tail-left-image", type std::string - TAIL_RIGHT_IMAGE, ///< name "tail-right-image", type std::string + DISPLAY_STATE, ///< name "displayState", type std::string + TOUCH_TRANSPARENT, ///< name "touchTransparent", type bool + TAIL_VISIBILITY, ///< name "tailVisibility", type bool + TAIL_POSITION, ///< name "tailPosition", type Vector3 + CONTEXTUAL_MODE, ///< name "contextualMode", type std::string + ANIMATION_DURATION, ///< name "animationDuration", type float + ANIMATION_MODE, ///< name "animationMode", type std::string + ENTRY_ANIMATION, ///< name "entryAnimation", type Property::Map + EXIT_ANIMATION, ///< name "exitAnimation", type Property::Map + AUTO_HIDE_DELAY, ///< name "autoHideDelay", type int + BACKING_ENABLED, ///< name "backingEnabled", type bool + BACKING_COLOR, ///< name "backingColor", type Vector4 + POPUP_BACKGROUND_IMAGE, ///< name "popupBackgroundImage", type std::string + TAIL_UP_IMAGE, ///< name "tailUpImage", type std::string + TAIL_DOWN_IMAGE, ///< name "tailDownImage", type std::string + TAIL_LEFT_IMAGE, ///< name "tailLeftImage", type std::string + TAIL_RIGHT_IMAGE, ///< name "tailRightImage", type std::string }; };