aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2010-02-06 16:58:15 +0000
committerChristopher Michael <cpmichael1@comcast.net>2010-02-06 16:58:15 +0000
commit63c874d7a64b35c6297db8cdffd71403925c2107 (patch)
treeac2e522cb504b0ca2c9fffd1689581136e22e793
parent3e0530d2b2228b0431f77f06a49111e58c7cc756 (diff)
downloadenlightenment-63c874d7a64b35c6297db8cdffd71403925c2107.tar.gz
enlightenment-63c874d7a64b35c6297db8cdffd71403925c2107.tar.xz
enlightenment-63c874d7a64b35c6297db8cdffd71403925c2107.zip
Fix quickpanel not showing correctly (this also needs elm_win update).
SVN revision: 45935
-rw-r--r--src/modules/illume2/e_quickpanel.c13
-rw-r--r--src/modules/illume2/policies/illume/layout.c1
2 files changed, 4 insertions, 10 deletions
diff --git a/src/modules/illume2/e_quickpanel.c b/src/modules/illume2/e_quickpanel.c
index 50e5e0de0..f79bd8ff4 100644
--- a/src/modules/illume2/e_quickpanel.c
+++ b/src/modules/illume2/e_quickpanel.c
@@ -148,12 +148,7 @@ e_quickpanel_position_update(E_Quickpanel *qp)
if (qp->borders)
{
EINA_LIST_FOREACH(qp->borders, l, bd)
- {
- bd->x = qp->zone->x;
- bd->y = ty;
- bd->changes.pos = 1;
- bd->changed = 1;
- }
+ e_border_move(bd, qp->zone->x, ty);
}
}
@@ -397,10 +392,8 @@ _e_quickpanel_cb_client_message(void *data, int type, void *event)
if (!(zone = e_util_zone_window_find(z))) return 1;
_e_quickpanel_border_hide(bd);
e_illume_border_top_shelf_pos_get(zone, NULL, &ty);
- if ((bd->x != zone->x) || (bd->y != ty))
- e_border_move(bd, zone->x, ty);
- if (bd->zone != zone)
- e_border_zone_set(bd, zone);
+ e_border_move(bd, zone->x, ty);
+ e_border_zone_set(bd, zone);
}
return 1;
}
diff --git a/src/modules/illume2/policies/illume/layout.c b/src/modules/illume2/policies/illume/layout.c
index 48fcbec9c..f354e64c6 100644
--- a/src/modules/illume2/policies/illume/layout.c
+++ b/src/modules/illume2/policies/illume/layout.c
@@ -246,6 +246,7 @@ _layout_zone_layout(E_Zone *zone)
}
else
{
+ if (bd->stolen) continue;
if (cfg_zone->mode.dual) _zone_layout_dual(bd);
else _zone_layout_single(bd);
if (e_illume_border_is_conformant(bd))