Peter M. Groen / dali-demo

Commit 649dcba0658187980844892ae0218ebec7903007

Authored by Agnelo Vaz
1 parent fd3c77f6

TextField updates to json style files 

Change-Id: I571058b0f303fb72ec5e46d55234d5950e91f0ba
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Inline Side-by-side
Showing 2 changed files with 46 additions and 6 deletions
resources/style/demo-theme.json
  View file @649dcba
... ... @@ -43,14 +43,33 @@ distributing this software or its derivatives.
43 43 {
44 44 "point-size":13
45 45 },
46   -
  46 + "textselectionpopuplabel":
  47 + {
  48 + "point-size":18
  49 + },
  50 + "textselectionpopup":
  51 + {
  52 + "popup-max-size":[400,100],
  53 + "option-divider-size":[2,0],
  54 + "popup-divider-color":[0.23,0.72,0.8,0.11],
  55 + "popup-icon-color":[1.0,1.0,1.0,1.0],
  56 + "popup-pressed-color":[0.24,0.72,0.8,0.11],
  57 + "background-image": {
  58 + "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
  59 + }
  60 + },
47 61 "textfield":
48 62 {
49 63 "font-family":"HelveticaNeue",
50 64 "font-style":"Regular",
51   - "point-size":18
  65 + "point-size":18,
  66 + "primary-cursor-color":[0.75,0.96,1.0,1.0],
  67 + "secondary-cursor-color":[1.0,0.71,0.9,1.0],
  68 + "selection-highlight-color":[0.75,0.96,1.0,1.0],
  69 + "grab-handle-image":"{DALI_IMAGE_DIR}cursor_handler_center.png",
  70 + "selection-handle-image-left":"{DALI_IMAGE_DIR}selection_handle_left.png",
  71 + "selection-handle-image-right":"{DALI_IMAGE_DIR}selection_handle_right.png"
52 72 },
53   -
54 73 "scrollview":
55 74 {
56 75 "overshoot-effect-color":"B018"
... ...
resources/style/mobile/demo-theme.json
  View file @649dcba
... ... @@ -25,7 +25,8 @@ distributing this software or its derivatives.
25 25 "textlabel":
26 26 {
27 27 "font-family":"SamsungSans",
28   - "font-style":"Regular"
  28 + "font-style":"Regular",
  29 + "point-size":18
29 30 },
30 31  
31 32 "textlabel-font-size-0":
... ... @@ -63,11 +64,31 @@ distributing this software or its derivatives.
63 64 {
64 65 "point-size":10
65 66 },
66   -
  67 + "textselectionpopuplabel":
  68 + {
  69 + "point-size":8
  70 + },
  71 + "textselectionpopup":
  72 + {
  73 + "popup-max-size":[400,100],
  74 + "option-divider-size":[2,0],
  75 + "popup-divider-color":[0.23,0.72,0.8,0.11],
  76 + "popup-icon-color":[1.0,1.0,1.0,1.0],
  77 + "popup-pressed-color":[0.24,0.72,0.8,0.11],
  78 + "background-image": {
  79 + "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
  80 + }
  81 + },
67 82 "textfield":
68 83 {
69 84 "font-family":"SamsungSans",
70   - "font-style":"Regular"
  85 + "font-style":"Regular",
  86 + "primary-cursor-color":[0.0,0.71,0.9,1.0],
  87 + "secondary-cursor-color":[0.0,0.71,0.9,1.0],
  88 + "selection-highlight-color":[0.75,0.96,1.0,1.0],
  89 + "grab-handle-image":"{DALI_IMAGE_DIR}cursor_handler_center.png",
  90 + "selection-handle-image-left":"{DALI_IMAGE_DIR}selection_handle_left.png",
  91 + "selection-handle-image-right":"{DALI_IMAGE_DIR}selection_handle_right.png"
71 92 },
72 93  
73 94 "textfield-font-size-0":
... ...