forked from enlightenment/enlightenment
make res dialog not segv if u dont select refresh rate, make refresh get
selected anyway, and re-enable window resize/move to fit onto the screen if you go down a resolution. SVN revision: 22517
This commit is contained in:
parent
aaf05fd73e
commit
282a978df4
|
@ -1141,7 +1141,7 @@ _e_container_resize_handle(E_Container *con)
|
||||||
{
|
{
|
||||||
E_Event_Container_Resize *ev;
|
E_Event_Container_Resize *ev;
|
||||||
Evas_List *l, *screens;
|
Evas_List *l, *screens;
|
||||||
#if 0
|
#if 1
|
||||||
int i;
|
int i;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1186,7 +1186,7 @@ _e_container_resize_handle(E_Container *con)
|
||||||
e_gadman_container_resize(con->gadman);
|
e_gadman_container_resize(con->gadman);
|
||||||
e_object_ref(E_OBJECT(con));
|
e_object_ref(E_OBJECT(con));
|
||||||
ecore_event_add(E_EVENT_CONTAINER_RESIZE, ev, _e_container_event_container_resize_free, NULL);
|
ecore_event_add(E_EVENT_CONTAINER_RESIZE, ev, _e_container_event_container_resize_free, NULL);
|
||||||
#if 0
|
#if 1
|
||||||
/* FIXME: This is wrong, we should only move/resize to save things from
|
/* FIXME: This is wrong, we should only move/resize to save things from
|
||||||
* disappearing!
|
* disappearing!
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -228,8 +228,10 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||||
|
|
||||||
sel_res = (char *)e_widget_ilist_selected_label_get(res_list);
|
sel_res = (char *)e_widget_ilist_selected_label_get(res_list);
|
||||||
sel_rate = (char *)e_widget_ilist_selected_label_get(rate_list);
|
sel_rate = (char *)e_widget_ilist_selected_label_get(rate_list);
|
||||||
sscanf(sel_res, "%dx%d", &w, &h);
|
if (!sel_res) return 0;
|
||||||
sscanf(sel_rate, "%d Hz", &r);
|
if (!sel_rate) return 0;
|
||||||
|
sscanf(sel_res, "%ix%i", &w, &h);
|
||||||
|
sscanf(sel_rate, "%i Hz", &r);
|
||||||
|
|
||||||
e_config->display_res_width = cfdata->orig_size.width;
|
e_config->display_res_width = cfdata->orig_size.width;
|
||||||
e_config->display_res_height = cfdata->orig_size.height;
|
e_config->display_res_height = cfdata->orig_size.height;
|
||||||
|
@ -374,7 +376,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
||||||
if ((res->size.width == size.width) &&
|
if ((res->size.width == size.width) &&
|
||||||
(res->size.height == size.height))
|
(res->size.height == size.height))
|
||||||
{
|
{
|
||||||
e_widget_ilist_selected_set(ol, sortindex[i]);
|
e_widget_ilist_selected_set(ol, i);
|
||||||
_load_rates(res);
|
_load_rates(res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -405,13 +407,13 @@ _load_rates(void *data)
|
||||||
e_widget_ilist_clear(rate_list);
|
e_widget_ilist_clear(rate_list);
|
||||||
|
|
||||||
for (k = 0; k < r; k++)
|
for (k = 0; k < r; k++)
|
||||||
{
|
{
|
||||||
|
snprintf(buf, sizeof(buf), "%i Hz", rts[k].rate);
|
||||||
snprintf(buf, sizeof(buf), "%d Hz", rts[k].rate);
|
|
||||||
e_widget_ilist_append(rate_list, NULL, buf, NULL, NULL, NULL);
|
e_widget_ilist_append(rate_list, NULL, buf, NULL, NULL, NULL);
|
||||||
if (rt.rate == rts[k].rate)
|
if (rt.rate == rts[k].rate)
|
||||||
e_widget_ilist_selected_set(rate_list, k);
|
e_widget_ilist_selected_set(rate_list, k);
|
||||||
}
|
}
|
||||||
|
e_widget_ilist_selected_set(rate_list, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue