1. fix child stuff .. smart object members.. that was just bad of me.. oops.

swapped params. i should have known better. *spank* and .. add visible "u
clikced here" tests to launcher test.

SVN revision: 46582

diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index b022504155ed5b469794d80ad0864dedd38abd1a..5b94a60c359015fce4c01eb01bffb018ce7b1b60 100644 (file)
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -303,6 +303,7 @@ elm_flip_content_front_set(Evas_Object *obj, Evas_Object *content)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
 
+   if (wd->front.content == content) return;
    if ((wd->front.content != content) && (wd->front.content))
      {
         elm_widget_sub_object_del(obj, wd->front.content);
@@ -312,7 +313,7 @@ elm_flip_content_front_set(Evas_Object *obj, Evas_Object *content)
    if (content)
      {
        elm_widget_sub_object_add(content, obj);
-        evas_object_smart_member_add(obj, content);
+        evas_object_smart_member_add(content, obj);
        evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                       _changed_size_hints, obj);
@@ -336,6 +337,7 @@ elm_flip_content_back_set(Evas_Object *obj, Evas_Object *content)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
 
+   if (wd->back.content == content) return;
    if ((wd->back.content != content) && (wd->back.content))
      {
         elm_widget_sub_object_del(obj, wd->back.content);
@@ -345,7 +347,7 @@ elm_flip_content_back_set(Evas_Object *obj, Evas_Object *content)
    if (content)
      {
        elm_widget_sub_object_add(content, obj);
-        evas_object_smart_member_add(obj, content);
+        evas_object_smart_member_add(content, obj);
        evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                       _changed_size_hints, obj);

diff --git a/src/lib/elm_mapbuf.c b/src/lib/elm_mapbuf.c
index bd305f11a70dd0784120b7daf219e536f5e20d45..5f1199d209150e757870939bc776e68f881de0c3 100644 (file)
--- a/src/lib/elm_mapbuf.c
+++ b/src/lib/elm_mapbuf.c
@@ -89,7 +89,7 @@ _mapbuf(Evas_Object *obj)
      {
         Evas_Map *m;
         Evas_Coord cx, cy, cz, px, py, foc;
-        
+
         m = evas_map_new(4);
         evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
         evas_map_smooth_set(m, wd->smooth);
@@ -111,10 +111,11 @@ static void
 _configure(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Coord x, y, w, h;
-   evas_object_geometry_get(obj, &x, &y, &w, &h);
    if (wd->content)
      {
+        Evas_Coord x, y, w, h;
+        
+        evas_object_geometry_get(obj, &x, &y, &w, &h);
         if (!wd->enabled) evas_object_move(wd->content, x, y);
         evas_object_resize(wd->content, w, h);
         _mapbuf(obj);
@@ -182,6 +183,7 @@ elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
 
+   if (wd->content == content) return;
    if ((wd->content != content) && (wd->content))
      {
         elm_widget_sub_object_del(obj, wd->content);
@@ -191,7 +193,7 @@ elm_mapbuf_content_set(Evas_Object *obj, Evas_Object *content)
    if (content)
      {
        elm_widget_sub_object_add(content, obj);
-        evas_object_smart_member_add(obj, content);
+        evas_object_smart_member_add(content, obj);
        evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                       _changed_size_hints, obj);

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index 8a5d3d93ef6f6939d2bb77f75f678097fb81d5a3..195acc3e3effb71b588e0f34a105de0826730546 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -1351,7 +1351,7 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
                        ay = ev->canvas.y;
                        at = 0.0;
 #ifdef SCROLLDBG
-                       printf("------\n");
+                       printf("------ %i %i\n", ev->canvas.x, ev->canvas.y);
 #endif
                        for (i = 0; i < 20; i++)
                          {
@@ -1486,6 +1486,9 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
          {
              int faildir = 0;
 
+#ifdef SCROLLDBG
+             printf("::: %i %i\n", ev->cur.canvas.x, ev->cur.canvas.y);
+#endif
             memmove(&(sd->down.history[1]), &(sd->down.history[0]),
                     sizeof(sd->down.history[0]) * 19);
 #ifdef EVTIME