Fix QP zone position bugger...thanks for the report Raster :)

SVN revision: 46634

diff --git a/src/modules/illume2/e_illume.c b/src/modules/illume2/e_illume.c
index 0254565..f4dc05c 100644 (file)
--- a/src/modules/illume2/e_illume.c
+++ b/src/modules/illume2/e_illume.c
@@ -531,9 +531,7 @@ e_illume_border_parent_get(E_Border *bd)
 
    /* NB: TEST CODE - may need to check bd->leader here */
    if (bd->leader) 
-     {
-        printf("\tDialog Has Leader: %s\n", bd->client.icccm.name);
-     }
+     printf("\tDialog Has Leader: %s\n", bd->client.icccm.name);
 
    /* check for transient */
    if (bd->client.icccm.transient_for) 

diff --git a/src/modules/illume2/e_illume.h b/src/modules/illume2/e_illume.h
index 51422ec..3d6c472 100644 (file)
--- a/src/modules/illume2/e_illume.h
+++ b/src/modules/illume2/e_illume.h
@@ -302,6 +302,7 @@ struct _E_Illume_Quickpanel
    E_Object e_obj_inherit;
 
    E_Zone *zone;
+   /**< the current zone on which this quickpanel belongs */
    Eina_List *borders;
    Ecore_Timer *timer;
    Ecore_Animator *animator;

diff --git a/src/modules/illume2/e_mod_quickpanel.c b/src/modules/illume2/e_mod_quickpanel.c
index 14dcc30..30bdacc 100644 (file)
--- a/src/modules/illume2/e_mod_quickpanel.c
+++ b/src/modules/illume2/e_mod_quickpanel.c
@@ -223,18 +223,18 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
         con = e_container_current_get(e_manager_current_get());
         zn = ev->border->client.illume.quickpanel.zone;
         zone = e_util_container_zone_number_get(con->num, zn);
-        if (!zone) return 1;
+        if (!zone) zone = e_util_container_zone_number_get(con->num, 0);
      }
 
    if (!(qp = e_illume_quickpanel_by_zone_get(zone))) return 1;
 
    /* set position and zone */
    e_illume_border_indicator_pos_get(zone, NULL, &iy);
-   if ((ev->border->x != zone->x) || (ev->border->y != iy))
+   if ((ev->border->x != zone->x) || (ev->border->y != iy)) 
      e_border_move(ev->border, zone->x, iy);
    if (ev->border->zone != zone) 
      e_border_zone_set(ev->border, zone);
-
+   
    /* hide this border */
    e_illume_border_hide(ev->border);