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=029dcbd27212e12a02ff39c18ecfc28d5210c659;hp=525857b73c68ff15a67a9b28dc2bf66e1156012c;hb=27649fa487f2913206331c98e41ea5787001061e;hpb=f3da11c2818c6d17706fbb2417f21b602b3190f5 diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index 525857b..029dcbd 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -1,24 +1,20 @@ /* -Copyright (c) 2000-2014 Samsung Electronics Co., Ltd All Rights Reserved - -This file is part of Dali Toolkit - -PROPRIETARY/CONFIDENTIAL - -This software is the confidential and proprietary information of -SAMSUNG ELECTRONICS ("Confidential Information"). You shall not -disclose such Confidential Information and shall use it only in -accordance with the terms of the license agreement you entered -into with SAMSUNG ELECTRONICS. - -SAMSUNG make no representations or warranties about the suitability -of the software, either express or implied, including but not limited -to the implied warranties of merchantability, fitness for a particular -purpose, or non-infringement. SAMSUNG shall not be liable for any -damages suffered by licensee as a result of using, modifying or -distributing this software or its derivatives. -*/ - + * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * + * This file is part of Dali Toolkit + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ //****************************************************************************** @@ -34,7 +30,11 @@ distributing this software or its derivatives. { "textlabel": { - "pointSize":18 + "pointSize":18, + "enableAutoScroll":false, + "autoScrollLoopCount":2, + "autoScrollGap":50, + "autoScrollSpeed":80 }, "textlabelFontSize0": @@ -98,7 +98,8 @@ distributing this software or its derivatives. "popupIconColor":[1.0,1.0,1.0,1.0], "popupPressedColor":[0.24,0.72,0.8,0.11], "background": { - "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png" + "rendererType": "IMAGE", + "url": "{DALI_IMAGE_DIR}selection-popup-bg.9.png" }, "popupFadeInDuration":0.25, "popupFadeOutDuration":0.25 @@ -131,6 +132,17 @@ distributing this software or its derivatives. "overshootEffectColor":"B018", "overshootAnimationSpeed":360.0, "overshootSize":[720.0,130.0] + }, + "texteditor": + { + "pointSize":18, + "primaryCursorColor":[0.0,0.72,0.9,1.0], + "secondaryCursorColor":[0.0,0.72,0.9,1.0], + "cursorWidth":3, + "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" } } } }