From cdb046b1f64a70b6e49adcbb93bc5481eb2f6a7c Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Mon, 29 Mar 2021 15:37:37 +0900 Subject: [PATCH] add theme to TextSelectionPopup/Button/Toolbar according to 6.5 IoT UX Change-Id: I3ee1fc5003743fa647418d73a83f54e53b498681 Signed-off-by: Bowon Ryu --- .../720x1280/dali-toolkit-default-theme.json | 23 ++++++++++++++------- .../IoT-selection-popup-background.9.png | Bin 0 -> 253 bytes 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json index 3627ef4..3b5d1ce 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) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * This file is part of Dali Toolkit * @@ -98,29 +98,36 @@ }, "TextSelectionPopup": { - "popupMaxSize":[656,72], - "optionDividerSize":[2,0], - "popupDividerColor":[0.23,0.72,0.8,0.11], + "popupMaxSize":[656,36], + "optionDividerSize":[1,0], + "optionDividerPadding":[0.0,0.0,6.0,6.0], + "popupDividerColor":[1.0,1.0,1.0,1.0], "popupIconColor":[1.0,1.0,1.0,1.0], "popupPressedColor":[0.24,0.72,0.8,0.11], "background": { "visualType": "IMAGE", - "url": "{DALI_IMAGE_DIR}selection-popup-background.9.png" + "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png", + "mixColor":[0.0,0.05,0.17,0.9] }, "backgroundBorder": { "visualType": "IMAGE", "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png", - "mixColor":[0.24,0.72,0.8,1.0] + "mixColor":[0.0,0.0,0.0,0.0] }, "popupFadeInDuration":0.25, "popupFadeOutDuration":0.25 }, "TextSelectionPopupButton": { + "minimumSize":[0,36], + "labelPadding":[0.0,0.0,0.0,0.0], "label": { "visualType":"TEXT", - "pointSize":8 + "pointSize":18, + "textColor":[1.0,1.0,1.0,1.0], + "fontFamily":"BreezeSans", + "fontStyle" : {"weight":"light"} }, "unselectedBackgroundVisual": { @@ -136,7 +143,7 @@ "TextSelectionToolbar": { "enableOvershoot":true, - "enableScrollBar":true, + "enableScrollBar":false, "scrollView": { "overshootAnimationSpeed":360.0, diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7903ae28fb7a2b99218946cd9803e0914bd64cdb GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK^0#=pIEGmG zKb`VW@Q?vVYhqKGi1`Y?YgUn^%;p>CD(ow7nl&$T-J|`_`s^9^DeE_!`sK;JecB;o zcdwTn2jt2cwze+e{BC|DGE`q|a-4z#TXRU)nL90p?>RSl9n)>;zagBkxH%%}yYdUJ zfaeQ-cd42FV+nY@;OYA-lZ@>hoCH+33RBn@Z17ko=$P|6?Q;0u=JbYH`^{C_P3@G- z@;@&8`ux@hp%bP-mvY+rvr~R-b4yyQyNLh7$`EG5sk6TW-Ou3Z>gTe~DWM4f#D8RD literal 0 HcmV?d00001 -- 2.7.4