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

E (RandR): Set resolution text on load, and also set the resolution to 

the "potential" snapping resolution as the user resizes.



SVN revision: 77194
This commit is contained in:
Christopher Michael 2012-09-28 09:49:24 +00:00
parent d027d51773
commit 3d62a1ccad
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,7 @@ e_smart_monitor_crtc_set(Evas_Object *obj, E_Randr_Crtc_Info *crtc)
Ecore_X_Randr_Mode_Info *mode = NULL;
E_Randr_Monitor_Info *monitor = NULL;
const char *name = NULL;
char buff[1024];
printf("Output: %d %s\n", output->xid, output->name);
@ -204,6 +205,12 @@ e_smart_monitor_crtc_set(Evas_Object *obj, E_Randr_Crtc_Info *crtc)
sd->max.w = mode->width;
sd->max.h = mode->height;
/* set resolution label based on current mode */
snprintf(buff, sizeof(buff), "%d x %d",
output->crtc->current_mode->width,
output->crtc->current_mode->height);
edje_object_part_text_set(sd->o_frame, "e.text.resolution", buff);
/* tell monitor object we are enabled/disabled */
if (output->connection_status ==
ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
@ -598,7 +605,19 @@ _e_smart_cb_resize_stop(void *data, Evas_Object *obj __UNUSED__, const char *emi
/* find the closest resolution to this one and snap to it */
if ((mode = _e_smart_monitor_resolution_get(sd, nrw, nrh)))
_e_smart_monitor_snap(mon, mode);
{
char buff[1024];
/* double rate = 0.0; */
/* if ((mode->hTotal) && (mode->vTotal)) */
/* rate = ((float)mode->dotClock / */
/* ((float)mode->hTotal * (float)mode->vTotal)); */
snprintf(buff, sizeof(buff), "%d x %d", mode->width, mode->height);
edje_object_part_text_set(sd->o_frame, "e.text.resolution", buff);
_e_smart_monitor_snap(mon, mode);
}
e_layout_child_lower(mon);
}
@ -787,6 +806,7 @@ _e_smart_monitor_resize(E_Smart_Data *sd, Evas_Object *mon, void *event)
Evas_Coord w, h;
Evas_Coord mx, my;
Evas_Coord nrw, nrh;
Ecore_X_Randr_Mode_Info *mode;
ev = event;
@ -812,6 +832,15 @@ _e_smart_monitor_resize(E_Smart_Data *sd, Evas_Object *mon, void *event)
/* graphically resize the monitor */
evas_object_resize(mon, w + mx, h + my);
/* find the closest resolution to this one that we would snap to */
if ((mode = _e_smart_monitor_resolution_get(sd, nrw, nrh)))
{
char buff[1024];
snprintf(buff, sizeof(buff), "%d x %d", mode->width, mode->height);
edje_object_part_text_set(sd->o_frame, "e.text.resolution", buff);
}
/* tell randr widget we resized this monitor so that it can
* update the layout for any monitors around this one */
evas_object_smart_callback_call(mon, "monitor_resized", NULL);