From: Adeel Kazmi Date: Fri, 23 Jun 2017 09:50:57 +0000 (+0000) Subject: Merge "DALi Version 1.2.45" into devel/master X-Git-Tag: dali_1.2.46~8 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6658c69d9cb50e204f4eb7e41365785060170d26;hp=ca3ee9f8028db9bad312ba208b3e1f79b660c0a3 Merge "DALi Version 1.2.45" into devel/master --- diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h index f95fc94..3c4f287 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h @@ -107,6 +107,9 @@ namespace Property /** * @brief The size of font in pixels. + * + * Conversion from Point size to Pixel size : + * Pixel size = Point size * DPI / 72 * @details name "pixelSize", type float */ PIXEL_SIZE, diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h index 21e2d56..34dee16 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h @@ -92,6 +92,9 @@ namespace Property /** * @brief The size of font in pixels. + * + * Conversion from Point size to Pixel size : + * Pixel size = Point size * DPI / 72 * @details name "pixelSize", type float */ PIXEL_SIZE = INPUT_OUTLINE + 2, diff --git a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h index 12e9c75..2721dc1 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h @@ -61,6 +61,9 @@ namespace Property /** * @brief The size of font in pixels. + * + * Conversion from Point size to Pixel size : + * Pixel size = Point size * DPI / 72 * @details name "pixelSize", type float */ PIXEL_SIZE = OUTLINE + 1, diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h index 19b58d6..a52b13e 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-editor.h +++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h @@ -77,7 +77,7 @@ public: TEXT_COLOR, ///< name "textColor", The text color, type VECTOR4 @SINCE_1_1.37 FONT_FAMILY, ///< name "fontFamily", The requested font family, type STRING @SINCE_1_1.37 FONT_STYLE, ///< name "fontStyle", The requested font style, type STRING or MAP @SINCE_1_2.13 - POINT_SIZE, ///< name "pointSize", The size of font in points, type FLOAT @SINCE_1_1.37 + POINT_SIZE, ///< name "pointSize", The size of font in points (Conversion from Pixel size to Point size : Point size = Pixel size * 72 / DPI), type FLOAT @SINCE_1_1.37 HORIZONTAL_ALIGNMENT, ///< name "horizontalAlignment", The text horizontal alignment, type STRING, values "BEGIN", "CENTER", "END" @SINCE_1_1.37 SCROLL_THRESHOLD, ///< name "scrollThreshold" Vertical scrolling will occur if the cursor is this close to the control border, type FLOAT @SINCE_1_1.37 SCROLL_SPEED, ///< name "scrollSpeed" The scroll speed in pixels per second, type FLOAT @SINCE_1_1.37 diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h index 1dd97cf..c951a2d 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -78,7 +78,7 @@ public: PLACEHOLDER_TEXT_FOCUSED, ///< name "placeholderTextFocused", The text to display when the TextField is empty with key-input focus, type STRING @SINCE_1_0.0 FONT_FAMILY, ///< name "fontFamily", The requested font family, type STRING @SINCE_1_0.0 FONT_STYLE, ///< name "fontStyle", The requested font style, type STRING or MAP @SINCE_1_2.13 - POINT_SIZE, ///< name "pointSize", The size of font in points, type FLOAT @SINCE_1_0.0 + POINT_SIZE, ///< name "pointSize", The size of font in points (Conversion from Pixel size to Point size : Point size = Pixel size * 72 / DPI), type FLOAT @SINCE_1_0.0 MAX_LENGTH, ///< name "maxLength" The maximum number of characters that can be inserted, type INTEGER @SINCE_1_0.0 EXCEED_POLICY, ///< name "exceedPolicy" Specifies how the text is truncated when it does not fit, type INTEGER @SINCE_1_0.0 HORIZONTAL_ALIGNMENT, ///< name "horizontalAlignment", The line horizontal alignment, type STRING, values "BEGIN", "CENTER", "END" @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h index bd28fce..7b331a6 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -119,6 +119,9 @@ public: /** * @brief The size of font in points. + * + * Conversion from Pixel size to Point size : + * Point size = Pixel size * 72 / DPI * @details name "pointSize", type FLOAT. * @SINCE_1_0.0 */