From b6b4e1fb008f3dc1029f71586671015d15782375 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Tue, 26 Jan 2021 12:19:57 +0000 Subject: [PATCH] conf_randr: display settings for current screen. When opening the screen setup dialogue, show the screen for the current zone. --- src/modules/conf_randr/e_int_config_randr2.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/modules/conf_randr/e_int_config_randr2.c b/src/modules/conf_randr/e_int_config_randr2.c index 364e2c05f..f1e48054d 100644 --- a/src/modules/conf_randr/e_int_config_randr2.c +++ b/src/modules/conf_randr/e_int_config_randr2.c @@ -837,8 +837,9 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data Evas_Object *win = cfd->dia->win; Evas_Object *o, *bx, *tb, *bx2; Eina_List *l; - E_Randr2_Screen *s, *first = NULL; + E_Randr2_Screen *s, *sc = NULL, *first = NULL; E_Config_Randr2_Screen *first_cfg = NULL; + E_Zone *zone; int i; e_dialog_resizable_set(cfd->dia, 1); @@ -864,6 +865,11 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data cfdata->screens = NULL; cfdata->screen_items = NULL; i = 0; + + zone = e_zone_current_get(); + if (zone) + sc = e_randr2_screen_id_find(zone->randr2_id); + EINA_LIST_FOREACH(e_randr2->screens, l, s) { Elm_Object_Item *it = NULL; @@ -907,6 +913,16 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data elm_object_text_set(o, s->info.name); } } + else if (!first && sc) + { + if (s->id == sc->id) + { + first = s; + first_cfg = cs; + cfdata->screen = i; + elm_object_text_set(o, s->info.name); + } + } else { if (!first)