X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fstyles%2F720x1280%2Fdali-toolkit-default-theme.json;h=0c48655bee023790d9f83996fd3b2d51fad103fb;hp=d4598f997556547daa8cb5f9e9eb728f889b7ce7;hb=eedb83ac31c3728a311dbe462bedc660f54094d8;hpb=2bb866335dd821778de0b7245b6d04c814f82efc diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index d4598f9..0c48655 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * This file is part of Dali Toolkit * @@ -26,6 +26,10 @@ //****************************************************************************** { + "config": + { + "alwaysShowFocus":false + }, "styles": { "TextLabel": @@ -57,14 +61,6 @@ { "pointSize":25 }, - "RadioButton": - { - "unselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected.png", - "selectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected.png", - "disabledUnselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected-disabled.png", - "disabledSelectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected-disabled.png" - }, - "TextField": { "pointSize":18, @@ -74,7 +70,8 @@ "selectionHighlightColor":[0.75,0.96,1.0,1.0], "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, - "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" } + "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }, + "enableSelection":true }, "TextFieldFontSize0": @@ -106,7 +103,12 @@ "popupPressedColor":[0.24,0.72,0.8,0.11], "background": { "visualType": "IMAGE", - "url": "{DALI_IMAGE_DIR}selection-popup-bg.9.png" + "url": "{DALI_IMAGE_DIR}selection-popup-background.9.png" + }, + "backgroundBorder": { + "visualType": "IMAGE", + "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png", + "mixColor":[0.24,0.72,0.8,1.0] }, "popupFadeInDuration":0.25, "popupFadeOutDuration":0.25 @@ -115,19 +117,45 @@ { "label": { - "visualType": "TEXT", + "visualType":"TEXT", "pointSize":8 + }, + "unselectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "" + }, + "selectedBackgroundVisual": + { + "visualType": "IMAGE", + "url": "" } }, "TextSelectionToolbar": { "enableOvershoot":true, + "enableScrollBar":true, "scrollView": { "overshootAnimationSpeed":360.0, "overshootSize":[720.0,130.0] } }, + "TextSelectionScrollBar": + { + "indicatorShowDuration":0.25, + "indicatorHideDuration":0.25, + "indicatorTransientDuration":1.0 + }, + "TextSelectionScrollIndicator": + { + "image": + { + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}text_selection_scroll_indicator.9.png" + }, + "color":[0.0,0.72,0.9,0.7] + }, "ScrollView": { "overshootEffectColor":"B018", @@ -140,6 +168,12 @@ "overshootAnimationSpeed":360.0, "overshootSize":[720.0,130.0] }, + "ScrollBar": + { + "indicatorShowDuration":0.25, + "indicatorHideDuration":0.25, + "color":[0.0,0.72,0.9,0.7] + }, "TextEditor": { "pointSize":18, @@ -149,7 +183,11 @@ "selectionHighlightColor":[0.75,0.96,1.0,1.0], "grabHandleImage" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", "selectionHandleImageLeft" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, - "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" } + "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" }, + "enableScrollBar":true, + "scrollBarShowDuration":0.8, + "scrollBarFadeDuration":0.5, + "enableSelection":true }, "Popup": { @@ -201,25 +239,57 @@ }, "ProgressBar": { - "progressValue": 0, "trackVisual":{ - "url":"{DALI_IMAGE_DIR}slider-skin.9.png", - "size":[24,24] + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-track.9.png" }, "progressVisual":{ - "url":"{DALI_IMAGE_DIR}slider-skin-progress.9.png", - "size":[24,24] - } - }, - "ProgressBarValueTextLabel": - { - "textColor":[0.8,0.8,1,1] + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-progress.9.png" + }, + "secondaryProgressVisual":{ + "visualType":"IMAGE", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-secondary-progress.9.png" + }, + "indeterminateVisual":{ + "visualType":"IMAGE", + "pixelArea":[0.0, 0.0, 10.0, 1.0], + "wrapModeU":"REPEAT", + "url":"{DALI_IMAGE_DIR}progress-bar-skin-indeterminate.png" + }, + "indeterminateVisualAnimation": + [ + { + "target":"indeterminateVisual", + "property":"pixelArea", + "initialValue":[0.0, 0.0, 10.0, 1.0], + "targetValue":[-1.0, 0.0, 10.0, 1.0], + "animator": + { + "alphaFunction":"DEFAULT", + "timePeriod": + { + "duration":0.8, + "delay":0 + } + } + } + ], + "labelVisual":{ + "visualType": "TEXT", + "textColor": [ 1.0, 1.0, 1.0, 1.0 ], + "pointSize" : 12.0, // Point size must always be provided to Text Visual + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER" + }, + "progressValue": 0.0, + "secondaryProgressValue":0.0, + "indeterminate": false }, "Button": { "initialAutoRepeatingDelay":2.0, - "nextAutoRepeatingDelay":0.9, - "labelStrutLength":12 + "nextAutoRepeatingDelay":0.9 // Note: Visuals added to Button will be used in all derived buttons unless overridden. }, "PushButton": @@ -228,6 +298,13 @@ "autoRepeating":false, "togglable":false, "labelPadding":[ 12.0, 12.0, 12.0, 12.0 ], + "label": + { + "visualType": "TEXT", + "horizontalAlignment": "CENTER", + "pointSize" : 10.0, // Point size must always be provided to Text Visual + "verticalAlignment": "CENTER" + }, "unselectedBackgroundVisual": { "visualType": "IMAGE", @@ -252,22 +329,29 @@ "CheckBoxButton": { "styles":["Button"], - "unselectedBackgroundVisual": + "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ], + "label": + { + "visualType": "TEXT", + "pointSize" : 10.0, // Point size must always be provided to Text Visual + "verticalAlignment": "CENTER" + }, + "unselectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}checkbox-unselected.png" }, - "selectedBackgroundVisual": + "selectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}checkbox-selected.png" }, - "disabledUnselectedBackgroundVisual": + "disabledUnselectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png" }, - "disabledSelectedBackgroundVisual": + "disabledSelectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png" @@ -276,22 +360,29 @@ "RadioButton": { "styles":["Button"], - "unselectedBackgroundVisual": + "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ], + "label": + { + "visualType": "TEXT", + "pointSize" : 10.0, // Point size must always be provided to Text Visual + "verticalAlignment": "CENTER" + }, + "unselectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}radio-button-unselected.png" }, - "selectedBackgroundVisual": + "selectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}radio-button-selected.png" }, - "disabledUnselectedBackgroundVisual": + "disabledUnselectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png" }, - "disabledSelectedBackgroundVisual": + "disabledSelectedVisual": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png"