From d828cc7241818c4a8d97d458f5d73616e11a1459 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 21 Sep 2009 12:50:34 +0000 Subject: [PATCH] 1. entry now finger sized... needs to be for fingers (set finger size for desktosp to 0) 2. more photocam work. SVN revision: 42595 --- data/themes/default.edc | 8 +++----- src/bin/test_entry.c | 12 +++++++++--- src/bin/test_photocam.c | 11 ++++++----- src/lib/elm_entry.c | 5 +++++ src/lib/elm_photocam.c | 5 +++-- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index d215c81..e88a956 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -4215,13 +4215,13 @@ collections { text { style: "entry_single_textblock_style"; min: 1 1; + max: 0 1; } } description { state: "disabled" 0.0; inherit: "default" 0.0; text { style: "entry_single_textblock_disabled_style"; - min: 0 1; } } } @@ -4263,13 +4263,13 @@ collections { text { style: "entry_single_textblock_style"; min: 1 1; + max: 0 1; } } description { state: "disabled" 0.0; inherit: "default" 0.0; text { style: "entry_single_textblock_disabled_style"; - min: 0 1; } } } @@ -4317,7 +4317,6 @@ collections { inherit: "default" 0.0; text { style: "entry_textblock_disabled_style"; - min: 0 1; } } } @@ -4365,7 +4364,6 @@ collections { inherit: "default" 0.0; text { style: "entry_textblock_disabled_style"; - min: 0 1; } } } @@ -4409,13 +4407,13 @@ collections { style: "entry_single_textblock_style"; repch: "*"; min: 1 1; + max: 0 1; } } description { state: "disabled" 0.0; inherit: "default" 0.0; text { style: "entry_single_textblock_disabled_style"; - min: 0 1; } } } diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index e149894..eb762bb 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -141,6 +141,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) sc = elm_scroller_add(win); elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_scroller_bounce_set(sc, 0, 0); evas_object_size_hint_weight_set(sc, 1.0, 0.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_box_pack_end(bx, sc); @@ -149,7 +150,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_entry_single_line_set(en, 1); elm_entry_entry_set(en, "Disabled entry"); evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.0); + evas_object_size_hint_align_set(en, -1.0, 0.5); elm_object_disabled_set(en, 1); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -159,6 +160,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) sc = elm_scroller_add(win); elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_scroller_bounce_set(sc, 0, 0); evas_object_size_hint_weight_set(sc, 1.0, 0.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_box_pack_end(bx, sc); @@ -167,7 +169,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_entry_password_set(en, 1); elm_entry_entry_set(en, "Access denied, give up!"); evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.0); + evas_object_size_hint_align_set(en, -1.0, 0.5); elm_object_disabled_set(en, 1); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -178,6 +180,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_weight_set(sc, 1.0, 1.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); + elm_scroller_bounce_set(sc, 0, 1); elm_box_pack_end(bx, sc); en = elm_entry_add(win); @@ -204,6 +207,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) sc = elm_scroller_add(win); elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_scroller_bounce_set(sc, 0, 0); evas_object_size_hint_weight_set(sc, 1.0, 0.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_box_pack_end(bx, sc); @@ -212,7 +216,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) elm_entry_single_line_set(en, 1); elm_entry_entry_set(en, "This is a single line"); evas_object_size_hint_weight_set(en, 1.0, 0.0); - evas_object_size_hint_align_set(en, -1.0, 0.0); + evas_object_size_hint_align_set(en, -1.0, 0.5); elm_entry_select_all(en); elm_scroller_content_set(sc, en); evas_object_show(en); @@ -222,6 +226,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) sc = elm_scroller_add(win); elm_scroller_content_min_limit(sc, 0, 1); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); + elm_scroller_bounce_set(sc, 0, 0); evas_object_size_hint_weight_set(sc, 1.0, 0.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_box_pack_end(bx, sc); @@ -240,6 +245,7 @@ test_entry_scrolled(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_weight_set(sc, 1.0, 1.0); evas_object_size_hint_align_set(sc, -1.0, -1.0); elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); + elm_scroller_bounce_set(sc, 0, 1); elm_box_pack_end(bx, sc); en = elm_entry_add(win); diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c index 783afc1..e9cea78 100644 --- a/src/bin/test_photocam.c +++ b/src/bin/test_photocam.c @@ -5,11 +5,12 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) { Evas_Object *win, *bg, *ph; char buf[PATH_MAX]; - const char *img[3] = + const char *img[4] = { - "/home/raster/t1.jpg", - "/home/raster/t2.jpg", - "/home/raster/t3.jpg" + "/home/raster/t1.jpg", // 5 mpixel + "/home/raster/t2.jpg", // 18 mpixel + "/home/raster/t3.jpg", // 39 mpixel + "/home/raster/t4.jpg" // 192 mpixel }; win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); @@ -25,7 +26,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_weight_set(ph, 1.0, 1.0); elm_win_resize_object_add(win, ph); - elm_photocam_file_set(ph, img[0]); + elm_photocam_file_set(ph, img[3]); evas_object_show(ph); diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index b35b011..7fde1ba 100644 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -123,9 +123,12 @@ _elm_win_recalc_job(void *data) resh = 0; minminw = 0; edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, 0, 0); + elm_coords_finger_size_adjust(1, &minw, 1, &minh); minminw = minw; edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, resw, 0); + elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(data, minminw, minh); + if (wd->single_line) maxh = minh; evas_object_size_hint_max_set(data, -1, maxh); if (wd->deferred_cur) elm_widget_show_region_set(data, wd->cx, wd->cy, wd->cw, wd->ch); @@ -151,7 +154,9 @@ _sizing_eval(Evas_Object *obj) { evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh); edje_object_size_min_calc(wd->ent, &minw, &minh); + elm_coords_finger_size_adjust(1, &minw, 1, &minh); evas_object_size_hint_min_set(obj, minw, minh); + if (wd->single_line) maxh = minh; evas_object_size_hint_max_set(obj, maxw, maxh); } } diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c index d0e2ae6..a8f54c5 100644 --- a/src/lib/elm_photocam.c +++ b/src/lib/elm_photocam.c @@ -238,8 +238,9 @@ grid_load(Evas_Object *obj) { wd->grid.grid[tn].want = 0; wd->grid.grid[tn].have = 0; - evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL); + evas_object_hide(wd->grid.grid[tn].img[loadnum]); evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 1); + evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL); } } } @@ -569,7 +570,7 @@ elm_photocam_add(Evas_Object *parent) wd->zoom = 1; - wd->grid.tsize = 256; + wd->grid.tsize = 512; wd->grid.img = evas_object_image_add(e); evas_object_image_scale_hint_set(wd->grid.img, EVAS_IMAGE_SCALE_HINT_STATIC); -- 2.7.4