From 51899e434a7e9ee1eafbfbd669aba9ab05ac15ac Mon Sep 17 00:00:00 2001 From: TaeHyeon Jeong Date: Thu, 23 Jan 2025 10:36:49 +0900 Subject: [PATCH] e_mod_effect: Apply E_Comp_Config getter/setter - Apply E_Comp_Config getter/setter for structure encapsulation. Change-Id: If04041d8925c342b77af65c02ff96fb834194da6 --- src/e_mod_effect.c | 20 ++++++++++---------- src/e_mod_effect_rotation.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/e_mod_effect.c b/src/e_mod_effect.c index a54e534..8e1d675 100644 --- a/src/e_mod_effect.c +++ b/src/e_mod_effect.c @@ -185,9 +185,9 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group) if (!ec) return; if (group == E_EFFECT_GROUP_KEYBOARD) - e_view_client_effect_set(e_client_view_get(ec), cfg->kbd_effect_style); + e_view_client_effect_set(e_client_view_get(ec), e_comp_config_kbd_effect_style_get()); else if (group == E_EFFECT_GROUP_BACKGROUND) - e_view_client_effect_set(e_client_view_get(ec), cfg->bg_effect_style); + e_view_client_effect_set(e_client_view_get(ec), e_comp_config_bg_effect_style_get()); else { E_Effect_Client *efc = NULL; @@ -201,11 +201,11 @@ _eff_object_setup(E_Client *ec, E_Effect_Group group) if ((parent_ec != ec) && (e_client_is_launching(parent_ec))) // Launchig case with parent at same time e_view_client_effect_set(e_client_view_get(ec), "no-effect"); else if ((efc) && (e_policy_client_is_home_screen(efc->reverse_ec))) // Home key effect senario - e_view_client_effect_set(e_client_view_get(ec), cfg->effect_style); - else if ((cfg) && (cfg->depth_in_style) && (e_client_effect_type_get(ec))) //depth-in senario - e_view_client_effect_set(e_client_view_get(ec), cfg->depth_in_style); - else if ((cfg) && (cfg->effect_style)) // normal launching case - e_view_client_effect_set(e_client_view_get(ec), cfg->effect_style); + e_view_client_effect_set(e_client_view_get(ec), e_comp_config_effect_style_get()); + else if ((cfg) && (e_comp_config_depth_in_style_get()) && (e_client_effect_type_get(ec))) //depth-in senario + e_view_client_effect_set(e_client_view_get(ec), e_comp_config_depth_in_style_get()); + else if ((cfg) && (e_comp_config_effect_style_get())) // normal launching case + e_view_client_effect_set(e_client_view_get(ec), e_comp_config_effect_style_get()); else e_view_client_effect_set(e_client_view_get(ec), "no-effect"); @@ -430,7 +430,7 @@ _eff_object_background_setup(E_Client *ec, E_Client *home_ec, E_Effect_Group gro cfg = e_comp_config_get(); if (!cfg) return; - if (!cfg->bg_effect_style) return; + if (!e_comp_config_bg_effect_style_get()) return; if (!ec) return; if (group != E_EFFECT_GROUP_NORMAL) return; @@ -1545,8 +1545,8 @@ e_mod_effect_init(void) if ((cfg = e_comp_config_get())) { - eff->file = eina_stringshare_add(cfg->effect_file); - eff->style = eina_stringshare_add(cfg->effect_style); + eff->file = eina_stringshare_add(e_comp_config_effect_file_get()); + eff->style = eina_stringshare_add(e_comp_config_effect_style_get()); } else { diff --git a/src/e_mod_effect_rotation.c b/src/e_mod_effect_rotation.c index afb6885..10f6fbe 100644 --- a/src/e_mod_effect_rotation.c +++ b/src/e_mod_effect_rotation.c @@ -378,7 +378,7 @@ _rotation_effect_object_create(Evas_Object *o) img = evas_object_image_filled_add(e_comp_evas_get()); evas_object_image_colorspace_set(img, EVAS_COLORSPACE_ARGB8888); - evas_object_image_smooth_scale_set(img, e_comp_config_get()->smooth_windows); + evas_object_image_smooth_scale_set(img, e_comp_config_smooth_windows_get()); if (buffer->type == E_COMP_WL_BUFFER_TYPE_SHM) { @@ -484,7 +484,7 @@ _rotation_effect_object_create(Evas_Object *o) img = evas_object_image_filled_add(e_comp_evas_get()); evas_object_image_colorspace_set(img, EVAS_COLORSPACE_ARGB8888); - evas_object_image_smooth_scale_set(img, e_comp_config_get()->smooth_windows); + evas_object_image_smooth_scale_set(img, e_comp_config_smooth_windows_get()); evas_object_image_alpha_set(img, 1); evas_object_image_size_set(img, w, h); evas_object_image_source_set(img, o); -- 2.34.1