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

E (RandR): Fix case where a disabled monitor would show up with no 

mode, or size.

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

SVN revision: 77879
This commit is contained in:
Christopher Michael 2012-10-11 13:01:04 +00:00 committed by Christopher Michael
parent c094541aef
commit bc3d8d18e2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,6 +287,7 @@ e_smart_monitor_info_set(Evas_Object *obj, E_Randr_Output_Info *output, E_Randr_
mode = eina_list_data_get(eina_list_last(sd->modes)); mode = eina_list_data_get(eina_list_last(sd->modes));
sd->max.w = mode->width; sd->max.w = mode->width;
sd->max.h = mode->height; sd->max.h = mode->height;
if (!crtc) sd->orig.mode = mode;
/* set monitor name */ /* set monitor name */
if (output) if (output)
@ -394,8 +395,6 @@ e_smart_monitor_crtc_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y
break; break;
} }
if (!crtc) return;
/* The case here is that crtc has not been set, so /* The case here is that crtc has not been set, so
* effectively this monitor is "disabled". As such, we cannot * effectively this monitor is "disabled". As such, we cannot
* really retrieve the 'crtc' geometry for it. That geometry is * really retrieve the 'crtc' geometry for it. That geometry is
@ -408,13 +407,14 @@ e_smart_monitor_crtc_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y
* Very Shortly so please do not report/bitch/etc, etc */ * Very Shortly so please do not report/bitch/etc, etc */
/* crtc = eina_list_nth(sd->output->possible_crtcs, 0); */ /* crtc = eina_list_nth(sd->output->possible_crtcs, 0); */
if (x) *x = crtc->geometry.x; if (crtc)
if (y) *y = crtc->geometry.y; {
if (w) *w = crtc->geometry.w; if (x) *x = crtc->geometry.x;
if (h) *h = crtc->geometry.h; if (y) *y = crtc->geometry.y;
}
/* if (w) *w = sd->current.mode->width; */ if (w) *w = sd->current.mode->width;
/* if (h) *h = sd->current.mode->height; */ if (h) *h = sd->current.mode->height;
} }
else else
{ {