From 68e70b0131c63576f5d49abdfda591f8fad995f8 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Fri, 26 Oct 2012 07:20:59 +0000 Subject: [PATCH] E: Fix bug. The "Look" submenu of a gadget would not have any item selected (Plain/Inset) if no style was previously selected for this gadget. This adds code that also checks the Client Class default style if no gadget style has been assigned yet. Signed-off-by: Christopher Michael SVN revision: 78505 --- src/bin/e_gadcon.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c index 410eb5aeb..a29ee8bcf 100644 --- a/src/bin/e_gadcon.c +++ b/src/bin/e_gadcon.c @@ -1757,7 +1757,12 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget e_util_menu_item_theme_icon_set(mi, "enlightenment/plain"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if ((gcc->style) && (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_PLAIN))) + if ((gcc->style) && + (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_PLAIN))) + e_menu_item_toggle_set(mi, 1); + else if ((gcc->client_class->default_style) && + (!strcmp(gcc->client_class->default_style, + E_GADCON_CLIENT_STYLE_PLAIN))) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_plain, gcc); @@ -1766,7 +1771,12 @@ e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu_gadget e_util_menu_item_theme_icon_set(mi, "enlightenment/inset"); e_menu_item_radio_group_set(mi, 1); e_menu_item_radio_set(mi, 1); - if ((gcc->style) && (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_INSET))) + if ((gcc->style) && + (!strcmp(gcc->style, E_GADCON_CLIENT_STYLE_INSET))) + e_menu_item_toggle_set(mi, 1); + else if ((gcc->client_class->default_style) && + (!strcmp(gcc->client_class->default_style, + E_GADCON_CLIENT_STYLE_INSET))) e_menu_item_toggle_set(mi, 1); e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_style_inset, gcc);