styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When we clone/un-clone, also set a Changed on the position so that 

Apply will handle new geometry for the monitor.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 82327
This commit is contained in:
Christopher Michael 2013-01-07 07:39:49 +00:00 committed by Christopher Michael
parent 4fadc7bf7f
commit 4f572243c1
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/conf_randr/e_smart_monitor.c
View File

@ -639,9 +639,15 @@ e_smart_monitor_clone_add(Evas_Object *obj, Evas_Object *mon)
/* set appropriate changes */
if (sd->orig.cloned != sd->current.cloned)
sd->changes |= E_SMART_MONITOR_CHANGED_CLONED;
{
sd->changes |= E_SMART_MONITOR_CHANGED_CLONED;
sd->changes |= E_SMART_MONITOR_CHANGED_POSITION;
}
else
sd->changes &= ~(E_SMART_MONITOR_CHANGED_CLONED);
{
sd->changes &= ~(E_SMART_MONITOR_CHANGED_CLONED);
sd->changes &= ~(E_SMART_MONITOR_CHANGED_POSITION);
}
/* set cloned parent */
msd->parent = obj;
@ -764,9 +770,6 @@ e_smart_monitor_clone_del(Evas_Object *obj, Evas_Object *mon)
else
msd->changes &= ~(E_SMART_MONITOR_CHANGED_CLONED);
/* set parent object */
msd->parent = NULL;
x = msd->cx;
y = msd->cy;
w = msd->cw;
@ -776,13 +779,19 @@ e_smart_monitor_clone_del(Evas_Object *obj, Evas_Object *mon)
*
* NB: Needed in the case that we have no previous setup, we are in a clone
* situation (from X), and we were not manually moved */
if ((msd->cw == 0) || (msd->ch == 0))
if (msd->orig.cloned)
{
e_layout_child_geometry_get(mon, &x, &y, &w, &h);
msd->current.x = x;
msd->current.y = y;
if ((msd->cw == 0) || (msd->ch == 0))
{
e_layout_child_geometry_get(mon, &x, &y, &w, &h);
msd->current.x = x;
msd->current.y = y;
}
}
/* set parent object */
msd->parent = NULL;
/* restore to starting size */
e_layout_child_resize(mon, w, h);