From 5f821ec54f6fffe105e0103093cb918165f08c9a Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 16 Aug 2009 05:05:59 +0000
Subject: [PATCH] fix redraw flashes for popus.

SVN revision: 41808
---
 src/bin/e_popup.c | 35 +++++++++++++++++++++++++++++++++--
 src/bin/e_popup.h |  1 +
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index f9bbe91dc..5dc09ea80 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -5,6 +5,7 @@
 
 /* local subsystem functions */
 static void _e_popup_free(E_Popup *pop);
+static int  _e_popup_idle_enterer(void *data);
 static int  _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
 static E_Popup *_e_popup_find_by_window(Ecore_X_Window win);
 /*
@@ -93,8 +94,21 @@ e_popup_show(E_Popup *pop)
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (pop->visible) return;
    pop->visible = 1;
-   ecore_evas_show(pop->ecore_evas);
-   e_container_shape_show(pop->shape);
+   if (pop->shaped)
+     {
+        ecore_evas_move(pop->ecore_evas,
+                        pop->zone->container->manager->w,
+                        pop->zone->container->manager->h);
+        ecore_evas_show(pop->ecore_evas);
+        e_container_shape_show(pop->shape);
+        if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+        pop->idle_enterer = ecore_idle_enterer_add(_e_popup_idle_enterer, pop);
+     }
+   else
+     {
+        ecore_evas_show(pop->ecore_evas);
+        e_container_shape_show(pop->shape);
+     }
 }
 
 EAPI void
@@ -103,6 +117,8 @@ e_popup_hide(E_Popup *pop)
    E_OBJECT_CHECK(pop);
    E_OBJECT_TYPE_CHECK(pop, E_POPUP_TYPE);
    if (!pop->visible) return;
+   if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+   pop->idle_enterer = NULL;
    pop->visible = 0;
    ecore_evas_hide(pop->ecore_evas);
    e_container_shape_hide(pop->shape);
@@ -280,6 +296,8 @@ e_popup_idler_before(void)
 static void
 _e_popup_free(E_Popup *pop)
 {
+   if (pop->idle_enterer) ecore_idle_enterer_del(pop->idle_enterer);
+   pop->idle_enterer = NULL;
    E_FREE(pop->shape_rects);
    pop->shape_rects_num = 0;
    e_container_shape_hide(pop->shape);
@@ -292,6 +310,19 @@ _e_popup_free(E_Popup *pop)
    free(pop);
 }
 
+static int
+_e_popup_idle_enterer(void *data)
+{
+   E_Popup *pop;
+   
+   pop = (E_Popup *)data;
+   ecore_evas_move(pop->ecore_evas,
+		   pop->zone->x + pop->x, 
+		   pop->zone->y + pop->y);
+   pop->idle_enterer = NULL;
+   return 0;
+}
+
 static int
 _e_popup_cb_window_shape(void *data, int ev_type, void *ev)
 {
diff --git a/src/bin/e_popup.h b/src/bin/e_popup.h
index 0097a4195..ad10ade22 100644
--- a/src/bin/e_popup.h
+++ b/src/bin/e_popup.h
@@ -28,6 +28,7 @@ struct _E_Popup
    E_Zone              *zone;
    int                  shape_rects_num;
    Ecore_X_Rectangle   *shape_rects;
+   Ecore_Idle_Enterer  *idle_enterer;
 };
 
 EAPI int         e_popup_init(void);