From ddc61b05fccb7c1a96ca677276914a0e1dde827b Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Wed, 7 Oct 2015 11:39:41 +0100 Subject: [PATCH] Different image sets depending on style selected * Style folders now contain an image directory * Images specific to that style (resolution) should be placed in that folder * Toolkit has an image-common folder for images that span all styles * Only TextField Images moved to style image folders in this patch Change-Id: I43d792c4f42dafb4b39e409425e51d404d261838 Signed-off-by: Agnelo Vaz --- build/tizen/dali-toolkit/Makefile.am | 9 ++- .../{images => images-common}/00_popup_bg.9.png | Bin .../{images => images-common}/00_popup_bg.png | Bin .../00_popup_bottom_bg.png | Bin .../00_popup_bubble_bg.png | Bin .../00_popup_bubble_tail_bottom.png | Bin .../00_popup_button_bg.png | Bin .../00_popup_button_pressed.png | Bin .../{images => images-common}/B16-8_TTS_focus.png | Bin .../button-disabled.9.png | Bin .../button-down-disabled.9.png | Bin .../{images => images-common}/button-down.9.png | Bin .../{images => images-common}/button-up.9.png | Bin .../checkbox-selected-diabled.png | Bin .../checkbox-selected.png | Bin .../checkbox-unselected-disabled.png | Bin .../checkbox-unselected.png | Bin .../copy_paste_icon_clipboard.png | Bin .../copy_paste_icon_copy.png | Bin .../copy_paste_icon_cut.png | Bin .../copy_paste_icon_paste.png | Bin .../copy_paste_icon_select.png | Bin .../copy_paste_icon_select_all.png | Bin .../cursor_handler_ball_center.png | Bin dali-toolkit/{images => images-common}/file.list | 0 .../insertpoint-icon-pressed.png | Bin .../{images => images-common}/insertpoint-icon.png | Bin .../{images => images-common}/keyboard_focus.png | Bin .../{images => images-common}/magnifier.png | Bin .../{images => images-common}/popup_bg.png | Bin .../popup_bubble_bg.#.png | Bin .../popup_bubble_bg_ef.#.png | Bin .../popup_bubble_bg_line.#.png | Bin .../popup_bubble_tail_bottom.png | Bin .../popup_bubble_tail_bottom_ef.png | Bin .../popup_bubble_tail_bottom_line.png | Bin .../popup_bubble_tail_top.png | Bin .../popup_bubble_tail_top_ef.png | Bin .../popup_bubble_tail_top_line.png | Bin .../{images => images-common}/popup_scroll.png | Bin .../{images => images-common}/popup_tail_down.png | Bin .../{images => images-common}/popup_tail_left.png | Bin .../{images => images-common}/popup_tail_right.png | Bin .../{images => images-common}/popup_tail_up.png | Bin .../radio-button-selected-disabled.png | Bin .../radio-button-selected.png | Bin .../radio-button-unselected-disabled.png | Bin .../radio-button-unselected.png | Bin .../selection-popup-bg.9.png | Bin .../selection_handle_ball_left.png | Bin .../selection_handle_ball_right.png | Bin .../selection_marker_left.png | Bin .../selection_marker_right.png | Bin .../slider-popup-arrow.png | Bin .../{images => images-common}/slider-popup.9.png | Bin .../{images => images-common}/slider-popup.png | Bin .../slider-skin-handle.png | Bin .../slider-skin-progress.9.png | Bin .../slider-skin-progress.png | Bin .../{images => images-common}/slider-skin.9.png | Bin .../{images => images-common}/slider-skin.png | Bin .../text-input-selection-handle-left-press.png | Bin .../text-input-selection-handle-left.png | Bin .../text-input-selection-handle-right-press.png | Bin .../text-input-selection-handle-right.png | Bin dali-toolkit/internal/builder/builder-impl.cpp | 1 + .../styles/480x800/dali-toolkit-default-theme.json | 6 +- .../480x800}/images/cursor_handler_drop_center.png | Bin .../480x800}/images/selection_handle_drop_left.png | Bin .../images/selection_handle_drop_right.png | Bin .../720x1280/dali-toolkit-default-theme.json | 6 +- .../720x1280/images/cursor_handler_drop_center.png | Bin 0 -> 3615 bytes .../720x1280/images/selection_handle_drop_left.png | Bin 0 -> 3455 bytes .../images/selection_handle_drop_right.png | Bin 0 -> 3459 bytes dali-toolkit/styles/file.list | 3 + docs/content/main.md | 1 + docs/content/programming-guide/styling.h | 62 +++++++++++++++++++++ 77 files changed, 80 insertions(+), 8 deletions(-) rename dali-toolkit/{images => images-common}/00_popup_bg.9.png (100%) rename dali-toolkit/{images => images-common}/00_popup_bg.png (100%) rename dali-toolkit/{images => images-common}/00_popup_bottom_bg.png (100%) rename dali-toolkit/{images => images-common}/00_popup_bubble_bg.png (100%) rename dali-toolkit/{images => images-common}/00_popup_bubble_tail_bottom.png (100%) rename dali-toolkit/{images => images-common}/00_popup_button_bg.png (100%) rename dali-toolkit/{images => images-common}/00_popup_button_pressed.png (100%) rename dali-toolkit/{images => images-common}/B16-8_TTS_focus.png (100%) rename dali-toolkit/{images => images-common}/button-disabled.9.png (100%) rename dali-toolkit/{images => images-common}/button-down-disabled.9.png (100%) rename dali-toolkit/{images => images-common}/button-down.9.png (100%) rename dali-toolkit/{images => images-common}/button-up.9.png (100%) rename dali-toolkit/{images => images-common}/checkbox-selected-diabled.png (100%) rename dali-toolkit/{images => images-common}/checkbox-selected.png (100%) rename dali-toolkit/{images => images-common}/checkbox-unselected-disabled.png (100%) rename dali-toolkit/{images => images-common}/checkbox-unselected.png (100%) rename dali-toolkit/{images => images-common}/copy_paste_icon_clipboard.png (100%) rename dali-toolkit/{images => images-common}/copy_paste_icon_copy.png (100%) rename dali-toolkit/{images => images-common}/copy_paste_icon_cut.png (100%) rename dali-toolkit/{images => images-common}/copy_paste_icon_paste.png (100%) rename dali-toolkit/{images => images-common}/copy_paste_icon_select.png (100%) rename dali-toolkit/{images => images-common}/copy_paste_icon_select_all.png (100%) rename dali-toolkit/{images => images-common}/cursor_handler_ball_center.png (100%) rename dali-toolkit/{images => images-common}/file.list (100%) rename dali-toolkit/{images => images-common}/insertpoint-icon-pressed.png (100%) rename dali-toolkit/{images => images-common}/insertpoint-icon.png (100%) rename dali-toolkit/{images => images-common}/keyboard_focus.png (100%) rename dali-toolkit/{images => images-common}/magnifier.png (100%) rename dali-toolkit/{images => images-common}/popup_bg.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_bg.#.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_bg_ef.#.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_bg_line.#.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_tail_bottom.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_tail_bottom_ef.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_tail_bottom_line.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_tail_top.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_tail_top_ef.png (100%) rename dali-toolkit/{images => images-common}/popup_bubble_tail_top_line.png (100%) rename dali-toolkit/{images => images-common}/popup_scroll.png (100%) rename dali-toolkit/{images => images-common}/popup_tail_down.png (100%) rename dali-toolkit/{images => images-common}/popup_tail_left.png (100%) rename dali-toolkit/{images => images-common}/popup_tail_right.png (100%) rename dali-toolkit/{images => images-common}/popup_tail_up.png (100%) rename dali-toolkit/{images => images-common}/radio-button-selected-disabled.png (100%) rename dali-toolkit/{images => images-common}/radio-button-selected.png (100%) rename dali-toolkit/{images => images-common}/radio-button-unselected-disabled.png (100%) rename dali-toolkit/{images => images-common}/radio-button-unselected.png (100%) rename dali-toolkit/{images => images-common}/selection-popup-bg.9.png (100%) rename dali-toolkit/{images => images-common}/selection_handle_ball_left.png (100%) rename dali-toolkit/{images => images-common}/selection_handle_ball_right.png (100%) rename dali-toolkit/{images => images-common}/selection_marker_left.png (100%) rename dali-toolkit/{images => images-common}/selection_marker_right.png (100%) rename dali-toolkit/{images => images-common}/slider-popup-arrow.png (100%) rename dali-toolkit/{images => images-common}/slider-popup.9.png (100%) rename dali-toolkit/{images => images-common}/slider-popup.png (100%) rename dali-toolkit/{images => images-common}/slider-skin-handle.png (100%) rename dali-toolkit/{images => images-common}/slider-skin-progress.9.png (100%) rename dali-toolkit/{images => images-common}/slider-skin-progress.png (100%) rename dali-toolkit/{images => images-common}/slider-skin.9.png (100%) rename dali-toolkit/{images => images-common}/slider-skin.png (100%) rename dali-toolkit/{images => images-common}/text-input-selection-handle-left-press.png (100%) rename dali-toolkit/{images => images-common}/text-input-selection-handle-left.png (100%) rename dali-toolkit/{images => images-common}/text-input-selection-handle-right-press.png (100%) rename dali-toolkit/{images => images-common}/text-input-selection-handle-right.png (100%) rename dali-toolkit/{ => styles/480x800}/images/cursor_handler_drop_center.png (100%) rename dali-toolkit/{ => styles/480x800}/images/selection_handle_drop_left.png (100%) rename dali-toolkit/{ => styles/480x800}/images/selection_handle_drop_right.png (100%) create mode 100644 dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png create mode 100644 dali-toolkit/styles/720x1280/images/selection_handle_drop_left.png create mode 100644 dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png create mode 100644 docs/content/programming-guide/styling.h diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 75d8ca4..d44e4b4 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -16,15 +16,16 @@ # Build the Dali Toolkit library -toolkit_images_dir = ../../../dali-toolkit/images +toolkit_images_dir = ../../../dali-toolkit/images-common toolkit_sounds_dir = ../../../dali-toolkit/sounds toolkit_src_dir = ../../../dali-toolkit/internal public_api_src_dir = ../../../dali-toolkit/public-api devel_api_src_dir = ../../../dali-toolkit/devel-api toolkit_styles_dir = $(STYLE_DIR) +toolkit_style_images_dir = $(STYLE_DIR)/images -include ../../../dali-toolkit/images/file.list +include ../../../dali-toolkit/images-common/file.list include ../../../dali-toolkit/sounds/file.list include ../../../dali-toolkit/styles/file.list include ../../../dali-toolkit/internal/file.list @@ -52,12 +53,16 @@ libdali_toolkit_la_SOURCES = \ dalistyledir = ${dataReadOnlyDir}/toolkit/styles/ dalistyle_DATA = ${dali_toolkit_style_files} +dalistyleimagesdir = ${dataReadOnlyDir}/toolkit/styles/images/ +dalistyleimages_DATA = ${dali_toolkit_style_images} + libdali_toolkit_la_DEPENDENCIES = libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \ -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \ -DDALI_SOUND_DIR="\"${dalisounddir}\"" \ -DDALI_STYLE_DIR="\"${dalistyledir}\"" \ + -DDALI_STYLE_IMAGE_DIR="\"${dalistyleimagesdir}\"" \ -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \ -Werror -Wall \ -I../../../ \ diff --git a/dali-toolkit/images/00_popup_bg.9.png b/dali-toolkit/images-common/00_popup_bg.9.png similarity index 100% rename from dali-toolkit/images/00_popup_bg.9.png rename to dali-toolkit/images-common/00_popup_bg.9.png diff --git a/dali-toolkit/images/00_popup_bg.png b/dali-toolkit/images-common/00_popup_bg.png similarity index 100% rename from dali-toolkit/images/00_popup_bg.png rename to dali-toolkit/images-common/00_popup_bg.png diff --git a/dali-toolkit/images/00_popup_bottom_bg.png b/dali-toolkit/images-common/00_popup_bottom_bg.png similarity index 100% rename from dali-toolkit/images/00_popup_bottom_bg.png rename to dali-toolkit/images-common/00_popup_bottom_bg.png diff --git a/dali-toolkit/images/00_popup_bubble_bg.png b/dali-toolkit/images-common/00_popup_bubble_bg.png similarity index 100% rename from dali-toolkit/images/00_popup_bubble_bg.png rename to dali-toolkit/images-common/00_popup_bubble_bg.png diff --git a/dali-toolkit/images/00_popup_bubble_tail_bottom.png b/dali-toolkit/images-common/00_popup_bubble_tail_bottom.png similarity index 100% rename from dali-toolkit/images/00_popup_bubble_tail_bottom.png rename to dali-toolkit/images-common/00_popup_bubble_tail_bottom.png diff --git a/dali-toolkit/images/00_popup_button_bg.png b/dali-toolkit/images-common/00_popup_button_bg.png similarity index 100% rename from dali-toolkit/images/00_popup_button_bg.png rename to dali-toolkit/images-common/00_popup_button_bg.png diff --git a/dali-toolkit/images/00_popup_button_pressed.png b/dali-toolkit/images-common/00_popup_button_pressed.png similarity index 100% rename from dali-toolkit/images/00_popup_button_pressed.png rename to dali-toolkit/images-common/00_popup_button_pressed.png diff --git a/dali-toolkit/images/B16-8_TTS_focus.png b/dali-toolkit/images-common/B16-8_TTS_focus.png similarity index 100% rename from dali-toolkit/images/B16-8_TTS_focus.png rename to dali-toolkit/images-common/B16-8_TTS_focus.png diff --git a/dali-toolkit/images/button-disabled.9.png b/dali-toolkit/images-common/button-disabled.9.png similarity index 100% rename from dali-toolkit/images/button-disabled.9.png rename to dali-toolkit/images-common/button-disabled.9.png diff --git a/dali-toolkit/images/button-down-disabled.9.png b/dali-toolkit/images-common/button-down-disabled.9.png similarity index 100% rename from dali-toolkit/images/button-down-disabled.9.png rename to dali-toolkit/images-common/button-down-disabled.9.png diff --git a/dali-toolkit/images/button-down.9.png b/dali-toolkit/images-common/button-down.9.png similarity index 100% rename from dali-toolkit/images/button-down.9.png rename to dali-toolkit/images-common/button-down.9.png diff --git a/dali-toolkit/images/button-up.9.png b/dali-toolkit/images-common/button-up.9.png similarity index 100% rename from dali-toolkit/images/button-up.9.png rename to dali-toolkit/images-common/button-up.9.png diff --git a/dali-toolkit/images/checkbox-selected-diabled.png b/dali-toolkit/images-common/checkbox-selected-diabled.png similarity index 100% rename from dali-toolkit/images/checkbox-selected-diabled.png rename to dali-toolkit/images-common/checkbox-selected-diabled.png diff --git a/dali-toolkit/images/checkbox-selected.png b/dali-toolkit/images-common/checkbox-selected.png similarity index 100% rename from dali-toolkit/images/checkbox-selected.png rename to dali-toolkit/images-common/checkbox-selected.png diff --git a/dali-toolkit/images/checkbox-unselected-disabled.png b/dali-toolkit/images-common/checkbox-unselected-disabled.png similarity index 100% rename from dali-toolkit/images/checkbox-unselected-disabled.png rename to dali-toolkit/images-common/checkbox-unselected-disabled.png diff --git a/dali-toolkit/images/checkbox-unselected.png b/dali-toolkit/images-common/checkbox-unselected.png similarity index 100% rename from dali-toolkit/images/checkbox-unselected.png rename to dali-toolkit/images-common/checkbox-unselected.png diff --git a/dali-toolkit/images/copy_paste_icon_clipboard.png b/dali-toolkit/images-common/copy_paste_icon_clipboard.png similarity index 100% rename from dali-toolkit/images/copy_paste_icon_clipboard.png rename to dali-toolkit/images-common/copy_paste_icon_clipboard.png diff --git a/dali-toolkit/images/copy_paste_icon_copy.png b/dali-toolkit/images-common/copy_paste_icon_copy.png similarity index 100% rename from dali-toolkit/images/copy_paste_icon_copy.png rename to dali-toolkit/images-common/copy_paste_icon_copy.png diff --git a/dali-toolkit/images/copy_paste_icon_cut.png b/dali-toolkit/images-common/copy_paste_icon_cut.png similarity index 100% rename from dali-toolkit/images/copy_paste_icon_cut.png rename to dali-toolkit/images-common/copy_paste_icon_cut.png diff --git a/dali-toolkit/images/copy_paste_icon_paste.png b/dali-toolkit/images-common/copy_paste_icon_paste.png similarity index 100% rename from dali-toolkit/images/copy_paste_icon_paste.png rename to dali-toolkit/images-common/copy_paste_icon_paste.png diff --git a/dali-toolkit/images/copy_paste_icon_select.png b/dali-toolkit/images-common/copy_paste_icon_select.png similarity index 100% rename from dali-toolkit/images/copy_paste_icon_select.png rename to dali-toolkit/images-common/copy_paste_icon_select.png diff --git a/dali-toolkit/images/copy_paste_icon_select_all.png b/dali-toolkit/images-common/copy_paste_icon_select_all.png similarity index 100% rename from dali-toolkit/images/copy_paste_icon_select_all.png rename to dali-toolkit/images-common/copy_paste_icon_select_all.png diff --git a/dali-toolkit/images/cursor_handler_ball_center.png b/dali-toolkit/images-common/cursor_handler_ball_center.png similarity index 100% rename from dali-toolkit/images/cursor_handler_ball_center.png rename to dali-toolkit/images-common/cursor_handler_ball_center.png diff --git a/dali-toolkit/images/file.list b/dali-toolkit/images-common/file.list similarity index 100% rename from dali-toolkit/images/file.list rename to dali-toolkit/images-common/file.list diff --git a/dali-toolkit/images/insertpoint-icon-pressed.png b/dali-toolkit/images-common/insertpoint-icon-pressed.png similarity index 100% rename from dali-toolkit/images/insertpoint-icon-pressed.png rename to dali-toolkit/images-common/insertpoint-icon-pressed.png diff --git a/dali-toolkit/images/insertpoint-icon.png b/dali-toolkit/images-common/insertpoint-icon.png similarity index 100% rename from dali-toolkit/images/insertpoint-icon.png rename to dali-toolkit/images-common/insertpoint-icon.png diff --git a/dali-toolkit/images/keyboard_focus.png b/dali-toolkit/images-common/keyboard_focus.png similarity index 100% rename from dali-toolkit/images/keyboard_focus.png rename to dali-toolkit/images-common/keyboard_focus.png diff --git a/dali-toolkit/images/magnifier.png b/dali-toolkit/images-common/magnifier.png similarity index 100% rename from dali-toolkit/images/magnifier.png rename to dali-toolkit/images-common/magnifier.png diff --git a/dali-toolkit/images/popup_bg.png b/dali-toolkit/images-common/popup_bg.png similarity index 100% rename from dali-toolkit/images/popup_bg.png rename to dali-toolkit/images-common/popup_bg.png diff --git a/dali-toolkit/images/popup_bubble_bg.#.png b/dali-toolkit/images-common/popup_bubble_bg.#.png similarity index 100% rename from dali-toolkit/images/popup_bubble_bg.#.png rename to dali-toolkit/images-common/popup_bubble_bg.#.png diff --git a/dali-toolkit/images/popup_bubble_bg_ef.#.png b/dali-toolkit/images-common/popup_bubble_bg_ef.#.png similarity index 100% rename from dali-toolkit/images/popup_bubble_bg_ef.#.png rename to dali-toolkit/images-common/popup_bubble_bg_ef.#.png diff --git a/dali-toolkit/images/popup_bubble_bg_line.#.png b/dali-toolkit/images-common/popup_bubble_bg_line.#.png similarity index 100% rename from dali-toolkit/images/popup_bubble_bg_line.#.png rename to dali-toolkit/images-common/popup_bubble_bg_line.#.png diff --git a/dali-toolkit/images/popup_bubble_tail_bottom.png b/dali-toolkit/images-common/popup_bubble_tail_bottom.png similarity index 100% rename from dali-toolkit/images/popup_bubble_tail_bottom.png rename to dali-toolkit/images-common/popup_bubble_tail_bottom.png diff --git a/dali-toolkit/images/popup_bubble_tail_bottom_ef.png b/dali-toolkit/images-common/popup_bubble_tail_bottom_ef.png similarity index 100% rename from dali-toolkit/images/popup_bubble_tail_bottom_ef.png rename to dali-toolkit/images-common/popup_bubble_tail_bottom_ef.png diff --git a/dali-toolkit/images/popup_bubble_tail_bottom_line.png b/dali-toolkit/images-common/popup_bubble_tail_bottom_line.png similarity index 100% rename from dali-toolkit/images/popup_bubble_tail_bottom_line.png rename to dali-toolkit/images-common/popup_bubble_tail_bottom_line.png diff --git a/dali-toolkit/images/popup_bubble_tail_top.png b/dali-toolkit/images-common/popup_bubble_tail_top.png similarity index 100% rename from dali-toolkit/images/popup_bubble_tail_top.png rename to dali-toolkit/images-common/popup_bubble_tail_top.png diff --git a/dali-toolkit/images/popup_bubble_tail_top_ef.png b/dali-toolkit/images-common/popup_bubble_tail_top_ef.png similarity index 100% rename from dali-toolkit/images/popup_bubble_tail_top_ef.png rename to dali-toolkit/images-common/popup_bubble_tail_top_ef.png diff --git a/dali-toolkit/images/popup_bubble_tail_top_line.png b/dali-toolkit/images-common/popup_bubble_tail_top_line.png similarity index 100% rename from dali-toolkit/images/popup_bubble_tail_top_line.png rename to dali-toolkit/images-common/popup_bubble_tail_top_line.png diff --git a/dali-toolkit/images/popup_scroll.png b/dali-toolkit/images-common/popup_scroll.png similarity index 100% rename from dali-toolkit/images/popup_scroll.png rename to dali-toolkit/images-common/popup_scroll.png diff --git a/dali-toolkit/images/popup_tail_down.png b/dali-toolkit/images-common/popup_tail_down.png similarity index 100% rename from dali-toolkit/images/popup_tail_down.png rename to dali-toolkit/images-common/popup_tail_down.png diff --git a/dali-toolkit/images/popup_tail_left.png b/dali-toolkit/images-common/popup_tail_left.png similarity index 100% rename from dali-toolkit/images/popup_tail_left.png rename to dali-toolkit/images-common/popup_tail_left.png diff --git a/dali-toolkit/images/popup_tail_right.png b/dali-toolkit/images-common/popup_tail_right.png similarity index 100% rename from dali-toolkit/images/popup_tail_right.png rename to dali-toolkit/images-common/popup_tail_right.png diff --git a/dali-toolkit/images/popup_tail_up.png b/dali-toolkit/images-common/popup_tail_up.png similarity index 100% rename from dali-toolkit/images/popup_tail_up.png rename to dali-toolkit/images-common/popup_tail_up.png diff --git a/dali-toolkit/images/radio-button-selected-disabled.png b/dali-toolkit/images-common/radio-button-selected-disabled.png similarity index 100% rename from dali-toolkit/images/radio-button-selected-disabled.png rename to dali-toolkit/images-common/radio-button-selected-disabled.png diff --git a/dali-toolkit/images/radio-button-selected.png b/dali-toolkit/images-common/radio-button-selected.png similarity index 100% rename from dali-toolkit/images/radio-button-selected.png rename to dali-toolkit/images-common/radio-button-selected.png diff --git a/dali-toolkit/images/radio-button-unselected-disabled.png b/dali-toolkit/images-common/radio-button-unselected-disabled.png similarity index 100% rename from dali-toolkit/images/radio-button-unselected-disabled.png rename to dali-toolkit/images-common/radio-button-unselected-disabled.png diff --git a/dali-toolkit/images/radio-button-unselected.png b/dali-toolkit/images-common/radio-button-unselected.png similarity index 100% rename from dali-toolkit/images/radio-button-unselected.png rename to dali-toolkit/images-common/radio-button-unselected.png diff --git a/dali-toolkit/images/selection-popup-bg.9.png b/dali-toolkit/images-common/selection-popup-bg.9.png similarity index 100% rename from dali-toolkit/images/selection-popup-bg.9.png rename to dali-toolkit/images-common/selection-popup-bg.9.png diff --git a/dali-toolkit/images/selection_handle_ball_left.png b/dali-toolkit/images-common/selection_handle_ball_left.png similarity index 100% rename from dali-toolkit/images/selection_handle_ball_left.png rename to dali-toolkit/images-common/selection_handle_ball_left.png diff --git a/dali-toolkit/images/selection_handle_ball_right.png b/dali-toolkit/images-common/selection_handle_ball_right.png similarity index 100% rename from dali-toolkit/images/selection_handle_ball_right.png rename to dali-toolkit/images-common/selection_handle_ball_right.png diff --git a/dali-toolkit/images/selection_marker_left.png b/dali-toolkit/images-common/selection_marker_left.png similarity index 100% rename from dali-toolkit/images/selection_marker_left.png rename to dali-toolkit/images-common/selection_marker_left.png diff --git a/dali-toolkit/images/selection_marker_right.png b/dali-toolkit/images-common/selection_marker_right.png similarity index 100% rename from dali-toolkit/images/selection_marker_right.png rename to dali-toolkit/images-common/selection_marker_right.png diff --git a/dali-toolkit/images/slider-popup-arrow.png b/dali-toolkit/images-common/slider-popup-arrow.png similarity index 100% rename from dali-toolkit/images/slider-popup-arrow.png rename to dali-toolkit/images-common/slider-popup-arrow.png diff --git a/dali-toolkit/images/slider-popup.9.png b/dali-toolkit/images-common/slider-popup.9.png similarity index 100% rename from dali-toolkit/images/slider-popup.9.png rename to dali-toolkit/images-common/slider-popup.9.png diff --git a/dali-toolkit/images/slider-popup.png b/dali-toolkit/images-common/slider-popup.png similarity index 100% rename from dali-toolkit/images/slider-popup.png rename to dali-toolkit/images-common/slider-popup.png diff --git a/dali-toolkit/images/slider-skin-handle.png b/dali-toolkit/images-common/slider-skin-handle.png similarity index 100% rename from dali-toolkit/images/slider-skin-handle.png rename to dali-toolkit/images-common/slider-skin-handle.png diff --git a/dali-toolkit/images/slider-skin-progress.9.png b/dali-toolkit/images-common/slider-skin-progress.9.png similarity index 100% rename from dali-toolkit/images/slider-skin-progress.9.png rename to dali-toolkit/images-common/slider-skin-progress.9.png diff --git a/dali-toolkit/images/slider-skin-progress.png b/dali-toolkit/images-common/slider-skin-progress.png similarity index 100% rename from dali-toolkit/images/slider-skin-progress.png rename to dali-toolkit/images-common/slider-skin-progress.png diff --git a/dali-toolkit/images/slider-skin.9.png b/dali-toolkit/images-common/slider-skin.9.png similarity index 100% rename from dali-toolkit/images/slider-skin.9.png rename to dali-toolkit/images-common/slider-skin.9.png diff --git a/dali-toolkit/images/slider-skin.png b/dali-toolkit/images-common/slider-skin.png similarity index 100% rename from dali-toolkit/images/slider-skin.png rename to dali-toolkit/images-common/slider-skin.png diff --git a/dali-toolkit/images/text-input-selection-handle-left-press.png b/dali-toolkit/images-common/text-input-selection-handle-left-press.png similarity index 100% rename from dali-toolkit/images/text-input-selection-handle-left-press.png rename to dali-toolkit/images-common/text-input-selection-handle-left-press.png diff --git a/dali-toolkit/images/text-input-selection-handle-left.png b/dali-toolkit/images-common/text-input-selection-handle-left.png similarity index 100% rename from dali-toolkit/images/text-input-selection-handle-left.png rename to dali-toolkit/images-common/text-input-selection-handle-left.png diff --git a/dali-toolkit/images/text-input-selection-handle-right-press.png b/dali-toolkit/images-common/text-input-selection-handle-right-press.png similarity index 100% rename from dali-toolkit/images/text-input-selection-handle-right-press.png rename to dali-toolkit/images-common/text-input-selection-handle-right-press.png diff --git a/dali-toolkit/images/text-input-selection-handle-right.png b/dali-toolkit/images-common/text-input-selection-handle-right.png similarity index 100% rename from dali-toolkit/images/text-input-selection-handle-right.png rename to dali-toolkit/images-common/text-input-selection-handle-right.png diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp index 4ea4aee..11b92f6 100644 --- a/dali-toolkit/internal/builder/builder-impl.cpp +++ b/dali-toolkit/internal/builder/builder-impl.cpp @@ -1363,6 +1363,7 @@ Builder::Builder() defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ] = DALI_IMAGE_DIR; defaultDirs[ TOKEN_STRING(DALI_SOUND_DIR) ] = DALI_SOUND_DIR; defaultDirs[ TOKEN_STRING(DALI_STYLE_DIR) ] = DALI_STYLE_DIR; + defaultDirs[ TOKEN_STRING(DALI_STYLE_IMAGE_DIR) ] = DALI_STYLE_IMAGE_DIR; AddConstants( defaultDirs ); } diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json index eee8bcb..dc32fbd 100644 --- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json @@ -65,9 +65,9 @@ distributing this software or its derivatives. "secondary-cursor-color":[0.0,0.72,0.9,1.0], "cursor-width":1, "selection-highlight-color":[0.75,0.96,1.0,1.0], - "grab-handle-image" : "{DALI_IMAGE_DIR}cursor_handler_drop_center.png", - "selection-handle-image-left" : {"filename":"{DALI_IMAGE_DIR}selection_handle_drop_left.png" }, - "selection-handle-image-right": {"filename":"{DALI_IMAGE_DIR}selection_handle_drop_right.png" } + "grab-handle-image" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", + "selection-handle-image-left" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, + "selection-handle-image-right": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" } }, "textfield-font-size-0": diff --git a/dali-toolkit/images/cursor_handler_drop_center.png b/dali-toolkit/styles/480x800/images/cursor_handler_drop_center.png similarity index 100% rename from dali-toolkit/images/cursor_handler_drop_center.png rename to dali-toolkit/styles/480x800/images/cursor_handler_drop_center.png diff --git a/dali-toolkit/images/selection_handle_drop_left.png b/dali-toolkit/styles/480x800/images/selection_handle_drop_left.png similarity index 100% rename from dali-toolkit/images/selection_handle_drop_left.png rename to dali-toolkit/styles/480x800/images/selection_handle_drop_left.png diff --git a/dali-toolkit/images/selection_handle_drop_right.png b/dali-toolkit/styles/480x800/images/selection_handle_drop_right.png similarity index 100% rename from dali-toolkit/images/selection_handle_drop_right.png rename to dali-toolkit/styles/480x800/images/selection_handle_drop_right.png diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index ec1b1c1..7501b72 100644 --- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json +++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json @@ -65,9 +65,9 @@ distributing this software or its derivatives. "secondary-cursor-color":[0.0,0.72,0.9,1.0], "cursor-width":3, "selection-highlight-color":[0.75,0.96,1.0,1.0], - "grab-handle-image" : "{DALI_IMAGE_DIR}cursor_handler_drop_center.png", - "selection-handle-image-left" : {"filename":"{DALI_IMAGE_DIR}selection_handle_drop_left.png" }, - "selection-handle-image-right": {"filename":"{DALI_IMAGE_DIR}selection_handle_drop_right.png" } + "grab-handle-image" : "{DALI_STYLE_IMAGE_DIR}cursor_handler_drop_center.png", + "selection-handle-image-left" : {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_left.png" }, + "selection-handle-image-right": {"filename":"{DALI_STYLE_IMAGE_DIR}selection_handle_drop_right.png" } }, "textfield-font-size-0": diff --git a/dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png b/dali-toolkit/styles/720x1280/images/cursor_handler_drop_center.png new file mode 100644 index 0000000000000000000000000000000000000000..15c937a5e166d25c90c0e01fe15e14102567fc2c GIT binary patch literal 3615 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 literal 0 HcmV?d00001 diff --git a/dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png b/dali-toolkit/styles/720x1280/images/selection_handle_drop_right.png new file mode 100644 index 0000000000000000000000000000000000000000..75035bc4d0ed4949870b1baa8754f6bd63df5fe9 GIT binary patch literal 3459 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 z z);gcB>@E62K?n?iAut36Aut4nzz`UOzz`S$LtqdBLtqFDfk6lifgvyi1|cv6hQJUQ lguoCO0z+UB0z+VWyaM3h!E0rajSc_+002ovPDHLkV1mEWYWDyD literal 0 HcmV?d00001 diff --git a/dali-toolkit/styles/file.list b/dali-toolkit/styles/file.list index 8e49fbe..6c329e9 100644 --- a/dali-toolkit/styles/file.list +++ b/dali-toolkit/styles/file.list @@ -2,3 +2,6 @@ dali_toolkit_style_files =\ $(toolkit_styles_dir)/*.json + +dali_toolkit_style_images =\ + $(toolkit_style_images_dir)/*.png diff --git a/docs/content/main.md b/docs/content/main.md index fefb8a3..920c5db 100644 --- a/docs/content/main.md +++ b/docs/content/main.md @@ -39,6 +39,7 @@ + [Relative To Constraint](@ref constraints-relative-to) + [Multi-threading Notes](@ref animation-multi-threading-notes) + [Shader Animation](@ref animation-shader) + + [Styling](@ref styling) ### Resources + [Resource Image](@ref resource-image) diff --git a/docs/content/programming-guide/styling.h b/docs/content/programming-guide/styling.h new file mode 100644 index 0000000..f1949ca --- /dev/null +++ b/docs/content/programming-guide/styling.h @@ -0,0 +1,62 @@ +/*! \page styling Styling + * +@section styling-controls Styling Controls + +DALi Controls can be styled to look and behaviour differently. + +There are 2 ways to style a control, 1 is recommended. + +1) json markup in one of the style files. + +~~~ + ... + "control": + { + "filename":"{IMAGES}file_name.png" + }, + ... +~~~ + +or 2) via code using SetProperty + +@code +Dali::Toolkit::Control control = Dali::Toolkit::Control::New(); +control.SetProperty( Control::BACKGROUND, "file_name.png" ); +@endcode + +By setting the properties in the json file and not in code it prevents the need to edit code and recompile if changes required. + +In the example above, if the png file needs to be changed, method 1 only requires the json file to be changed and no actual code change. + +@section choosing-style-at-build Choosing Style files at build time + +When building for a target, a style selector should be specified. + +The selectors are resolution biased e.g; 720 and 480. + +Below can be added to configure to select a style + +@code +./configure --with-style=480 +@endcode + +@code +./configure --with-style=720 +@endcode + + +or for gbs the below define added to the build command + +@code +--define "dali_style 480x800" +@endcode + +@section resources-for-styling Style specific resources + +Each style selector can have resource folders associated with it. + +Images for that style should be in their own folder named images. + +Common images not specific for a particular style will be in the dali-toolkit common images folder. +* +*/ -- 2.7.4