Merge "Added config section to stylesheet" into devel/master
authorminho.sun <minho.sun@samsung.com>
Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)
1  2 
dali-toolkit/devel-api/file.list
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json

@@@ -27,10 -27,10 +27,11 @@@ devel_api_src_files = 
    $(devel_api_src_dir)/controls/tool-bar/tool-bar.cpp \
    $(devel_api_src_dir)/focus-manager/keyinput-focus-manager.cpp \
    $(devel_api_src_dir)/focus-manager/keyboard-focus-manager-devel.cpp \
 +  $(devel_api_src_dir)/image-loader/async-image-loader-devel.cpp \
    $(devel_api_src_dir)/image-loader/atlas-upload-observer.cpp \
    $(devel_api_src_dir)/image-loader/image-atlas.cpp \
    $(devel_api_src_dir)/scripting/script.cpp \
+   $(devel_api_src_dir)/styling/style-manager-devel.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-effect.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
@@@ -113,7 -113,6 +114,7 @@@ devel_api_focus_manager_header_files = 
    $(devel_api_src_dir)/focus-manager/keyboard-focus-manager-devel.h
  
  devel_api_image_loader_header_files = \
 +  $(devel_api_src_dir)/image-loader/async-image-loader-devel.h \
    $(devel_api_src_dir)/image-loader/atlas-upload-observer.h \
    $(devel_api_src_dir)/image-loader/image-atlas.h
  
@@@ -133,6 -132,9 +134,9 @@@ devel_api_shader_effects_header_files 
    $(devel_api_src_dir)/shader-effects/motion-blur-effect.h \
    $(devel_api_src_dir)/shader-effects/motion-stretch-effect.h
  
+ devel_api_styling_header_files= \
+   $(devel_api_src_dir)/styling/style-manager-devel.h
  devel_api_super_blur_view_header_files = \
    $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.h
  
  //******************************************************************************
  
  {
+   "config":
+   {
+     "alwaysShowFocus":false
+   },
    "styles":
    {
      "Tooltip":
@@@ -93,8 -97,7 +97,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":false
      },
  
      "TextFieldFontSize0":
        "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" },
        "enableScrollBar":true,
        "scrollBarShowDuration":0.8,
 -      "scrollBarFadeDuration":0.5
 +      "scrollBarFadeDuration":0.5,
 +      "enableSelection":false
      },
      "ProgressBar":
      {
  //******************************************************************************
  
  {
+   "config":
+   {
+     "alwaysShowFocus":false
+   },
    "styles":
    {
      "Tooltip":
@@@ -92,8 -96,7 +96,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":
        "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" },
        "enableScrollBar":true,
        "scrollBarShowDuration":0.8,
 -      "scrollBarFadeDuration":0.5
 +      "scrollBarFadeDuration":0.5,
 +      "enableSelection":true
      },
      "Popup":
      {
  //******************************************************************************
  
  {
+   "config":
+   {
+     "alwaysShowFocus":false
+   },
    "styles":
    {
      "TextLabel":
@@@ -66,8 -70,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":
        "selectionHandleImageRight": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" },
        "enableScrollBar":true,
        "scrollBarShowDuration":0.8,
 -      "scrollBarFadeDuration":0.5
 +      "scrollBarFadeDuration":0.5,
 +      "enableSelection":true
      },
      "Popup":
      {