summaryrefslogtreecommitdiff
path: root/src/bin/options_colors.c
diff options
context:
space:
mode:
authorWonguk Jeong <wonguk.jeong@samsung.com>2014-08-25 21:58:19 +0200
committerWonguk Jeong <wonguk.jeong@samsung.com>2014-08-25 21:58:19 +0200
commitf06c9f52a35793193ee886284e6669b7c3c9227e (patch)
treeb7d09b896ab3ce3994f0b9e8d4c1eb1e7efefffb /src/bin/options_colors.c
parenta25b27e232b3a68104bd20b4ac420b511ddcc05f (diff)
Revert "options: color picker added"
it makes option color ugly. I will put picker again after figure it out This reverts commit a25b27e232b3a68104bd20b4ac420b511ddcc05f.
Diffstat (limited to 'src/bin/options_colors.c')
-rw-r--r--src/bin/options_colors.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/bin/options_colors.c b/src/bin/options_colors.c
index 2de27c1..d8030f6 100644
--- a/src/bin/options_colors.c
+++ b/src/bin/options_colors.c
@@ -25,7 +25,6 @@ static const char *mapping_names[] =
25 25
26static Elm_Object_Item *colitem[4][11] = { { NULL } }; 26static Elm_Object_Item *colitem[4][11] = { { NULL } };
27static Evas_Object *colorsel = NULL; 27static Evas_Object *colorsel = NULL;
28static Evas_Object *colorpicker = NULL;
29static Elm_Object_Item *curitem = NULL; 28static Elm_Object_Item *curitem = NULL;
30static Evas_Object *colpal[4] = { NULL }; 29static Evas_Object *colpal[4] = { NULL };
31static Evas_Object *label = NULL, *reset = NULL; 30static Evas_Object *label = NULL, *reset = NULL;
@@ -40,7 +39,6 @@ _cb_op_use_custom_chg(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA
40 39
41 state = elm_check_state_get(obj); 40 state = elm_check_state_get(obj);
42 elm_object_disabled_set(colorsel, !state); 41 elm_object_disabled_set(colorsel, !state);
43 elm_object_disabled_set(colorpicker, !state);
44 for (i = 0; i < 4; i++) elm_object_disabled_set(colpal[i], !state); 42 for (i = 0; i < 4; i++) elm_object_disabled_set(colpal[i], !state);
45 elm_object_disabled_set(label, !state); 43 elm_object_disabled_set(label, !state);
46 config->colors_use = state; 44 config->colors_use = state;
@@ -58,7 +56,6 @@ _cb_op_color_item_sel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
58 curitem = it; 56 curitem = it;
59 elm_colorselector_palette_item_color_get(it, &r, &g, &b, &a); 57 elm_colorselector_palette_item_color_get(it, &r, &g, &b, &a);
60 elm_colorselector_color_set(colorsel, r, g, b, a); 58 elm_colorselector_color_set(colorsel, r, g, b, a);
61 elm_colorselector_color_set(colorpicker, r, g, b, a);
62 for (j = 0; j < 4; j++) 59 for (j = 0; j < 4; j++)
63 { 60 {
64 for (i = 0; i < 11; i++) 61 for (i = 0; i < 11; i++)
@@ -79,10 +76,6 @@ _cb_op_color_chg(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUS
79 76
80 elm_colorselector_palette_item_color_get(curitem, &rr, &gg, &bb, &aa); 77 elm_colorselector_palette_item_color_get(curitem, &rr, &gg, &bb, &aa);
81 elm_colorselector_color_get(obj, &r, &g, &b, &a); 78 elm_colorselector_color_get(obj, &r, &g, &b, &a);
82 if (obj == colorsel)
83 elm_colorselector_color_set(colorpicker, r, g, b, a);
84 else
85 elm_colorselector_color_set(colorsel, r, g, b, a);
86 if ((r != rr) || (g != gg) || (b != bb) || (a != aa)) 79 if ((r != rr) || (g != gg) || (b != bb) || (a != aa))
87 { 80 {
88 if (curitem) 81 if (curitem)
@@ -140,7 +133,6 @@ _cb_op_reset(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event E
140 elm_object_disabled_set(reset, EINA_TRUE); 133 elm_object_disabled_set(reset, EINA_TRUE);
141 elm_colorselector_palette_item_color_get(curitem, &r, &g, &b, &a); 134 elm_colorselector_palette_item_color_get(curitem, &r, &g, &b, &a);
142 elm_colorselector_color_set(colorsel, r, g, b, a); 135 elm_colorselector_color_set(colorsel, r, g, b, a);
143 elm_colorselector_color_set(colorpicker, r, g, b, a);
144 termio_config_update(term); 136 termio_config_update(term);
145 config_save(config, NULL); 137 config_save(config, NULL);
146} 138}
@@ -258,15 +250,6 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
258 evas_object_show(o); 250 evas_object_show(o);
259 evas_object_smart_callback_add(o, "changed", _cb_op_color_chg, term); 251 evas_object_smart_callback_add(o, "changed", _cb_op_color_chg, term);
260 252
261 colorpicker = o = elm_colorselector_add(opbox);
262 elm_colorselector_color_set(o, r, g, b, a);
263 elm_colorselector_mode_set(o, ELM_COLORSELECTOR_PICKER);
264 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
265 evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
266 elm_box_pack_end(bx2, o);
267 evas_object_show(o);
268 evas_object_smart_callback_add(o, "changed", _cb_op_color_chg, term);
269
270 bx4 = o = elm_box_add(opbox); 253 bx4 = o = elm_box_add(opbox);
271 elm_box_horizontal_set(o, EINA_TRUE); 254 elm_box_horizontal_set(o, EINA_TRUE);
272 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); 255 evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);