From e62da06cd3db680d77cb7a68fa7cb89e5c11f7de Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Sat, 25 Feb 2012 10:50:19 +0000 Subject: [PATCH] Add scrollframe to conf_randr. e_layout's child size is not right SVN revision: 68441 --- src/modules/conf_randr/e_int_config_randr.h | 2 +- .../conf_randr/e_int_config_randr_arrangement.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/modules/conf_randr/e_int_config_randr.h b/src/modules/conf_randr/e_int_config_randr.h index 85a065db5..94e9e16cc 100644 --- a/src/modules/conf_randr/e_int_config_randr.h +++ b/src/modules/conf_randr/e_int_config_randr.h @@ -23,7 +23,7 @@ struct _E_Config_Dialog_Data E_Config_Randr_Dialog_Confirmation_Dialog_Data *confirmation_dialog; struct { struct { - Evas_Object *widget, *area, *widget_list, *swallowing_edje, *suggestion, *check_display_disconnected_outputs; + Evas_Object *widget, *scrollframe, *area, *widget_list, *swallowing_edje, *suggestion, *check_display_disconnected_outputs; int suggestion_dist_min, check_val_display_disconnected_outputs; } arrangement; struct { diff --git a/src/modules/conf_randr/e_int_config_randr_arrangement.c b/src/modules/conf_randr/e_int_config_randr_arrangement.c index e7aa2bb50..64d9712f7 100644 --- a/src/modules/conf_randr/e_int_config_randr_arrangement.c +++ b/src/modules/conf_randr/e_int_config_randr_arrangement.c @@ -115,7 +115,8 @@ _arrangement_widget_update(void) (!odd->output->monitor && (randr_dialog_config && !randr_dialog_config->display_disconnected_outputs))) continue; - odd->rep = _arrangement_widget_rep_add(e_config_runtime_info->gui.canvas, odd); + if(!(odd->rep = _arrangement_widget_rep_add(e_config_runtime_info->gui.canvas, odd))) + continue; if (odd->crtc && odd->crtc->current_mode) { geo.x = odd->crtc->geometry.x; @@ -155,7 +156,7 @@ arrangement_widget_create_data(E_Config_Dialog_Data *data) Evas_Object * arrangement_widget_basic_create_widgets(Evas *canvas) { - Evas_Object *widget, *area, *check; + Evas_Object *widget, *scrollframe, *area, *check; if (!canvas || !e_config_runtime_info || !e_config_runtime_info->output_dialog_data_list) return NULL; @@ -171,13 +172,17 @@ arrangement_widget_basic_create_widgets(Evas *canvas) area = e_layout_add(canvas); e_config_runtime_info->gui.widgets.arrangement.area = area; + evas_object_resize(area, 400, 200); + evas_object_show(area); _arrangement_widget_update(); - // Append both objects to widget list - e_widget_list_object_append(widget, area, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_FILL); - e_widget_list_object_append(widget, check, 0, 0, 1.0); + scrollframe = e_scrollframe_add(canvas); + e_scrollframe_child_set(scrollframe, area); + e_config_runtime_info->gui.widgets.arrangement.scrollframe = scrollframe; - evas_object_show(area); + // Append both objects to widget list + e_widget_list_object_append(widget, scrollframe, EVAS_HINT_FILL, EVAS_HINT_EXPAND, EVAS_HINT_FILL); + e_widget_list_object_append(widget, check, 0, 0, 1.0); e_config_runtime_info->gui.widgets.arrangement.widget_list = widget;