From 263ee545457bf4f5b473c9cd4fd11cb41c2d23df Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 21 Jul 2017 16:20:04 -0400 Subject: [PATCH] rename bg_blank_object -> resize_object for a more accurate name --- src/bin/e_comp.c | 2 +- src/bin/e_comp.h | 2 +- src/bin/e_comp_canvas.c | 6 +++--- src/bin/e_comp_x.c | 2 +- src/bin/e_gadget.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 0a7ad4e58..8cda44c6f 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -567,7 +567,7 @@ _e_comp_shapes_update_object_checker_function_thingy(Evas_Object *o) Eina_List *l; E_Zone *zone; - if (o == e_comp->canvas->bg_blank_object) return EINA_TRUE; + if (o == e_comp->canvas->resize_object) return EINA_TRUE; EINA_LIST_FOREACH(e_comp->zones, l, zone) { if ((o == zone->over) || (o == zone->base)) return EINA_TRUE; diff --git a/src/bin/e_comp.h b/src/bin/e_comp.h index c3acb4bec..5632ff188 100644 --- a/src/bin/e_comp.h +++ b/src/bin/e_comp.h @@ -84,7 +84,7 @@ typedef struct E_Comp_Screen_Iface */ typedef struct E_Comp_Canvas { - Evas_Object *bg_blank_object; //black blocker rect to cover background artifacts + Evas_Object *resize_object; //object to monitor for comp canvas resizes Evas_Object *fps_bg; Evas_Object *fps_fg; Evas_Object *gadget_site; //desktop gadget site diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index 20699a275..b0b4e904d 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -373,12 +373,12 @@ e_comp_canvas_init(int w, int h) if (e_first_frame) evas_event_callback_add(e_comp->evas, EVAS_CALLBACK_RENDER_POST, _e_comp_canvas_cb_first_frame, NULL); o = evas_object_rectangle_add(e_comp->evas); - e_comp->canvas->bg_blank_object = o; + e_comp->canvas->resize_object = o; evas_object_layer_set(o, E_LAYER_BOTTOM); evas_object_move(o, 0, 0); evas_object_resize(o, e_comp->w, e_comp->h); evas_object_color_set(o, 0, 0, 0, 255); - evas_object_name_set(o, "comp->canvas->bg_blank_object"); + evas_object_name_set(o, "comp->canvas->resize_object"); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, (Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_down, NULL); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, (Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_up, NULL); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, (Evas_Object_Event_Cb)_e_comp_canvas_cb_mouse_in, NULL); @@ -720,7 +720,7 @@ e_comp_canvas_update(void) } e_comp_canvas_zone_update(zone); } - evas_object_resize(e_comp->canvas->bg_blank_object, e_comp->w, e_comp->h); + evas_object_resize(e_comp->canvas->resize_object, e_comp->w, e_comp->h); } E_API void diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 80769509f..7f8b4e96a 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5596,7 +5596,7 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h) e_pointer_window_add(e_comp->pointer, e_comp->root); _e_comp_x_manage_windows(); - return !!e_comp->canvas->bg_blank_object; + return !!e_comp->canvas->resize_object; } static Eina_Bool diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c index bf5b340c5..5673dab99 100644 --- a/src/bin/e_gadget.c +++ b/src/bin/e_gadget.c @@ -2010,7 +2010,7 @@ e_gadget_init(void) comp_add_handler = ecore_event_handler_add(E_EVENT_COMP_OBJECT_ADD, (Ecore_Event_Handler_Cb)_site_auto_comp_object_handler, NULL); comp_site = e_comp->canvas->gadget_site = e_gadget_site_add(E_GADGET_SITE_ORIENT_NONE, "__desktop"); - evas_object_event_callback_add(e_comp->canvas->bg_blank_object, EVAS_CALLBACK_RESIZE, _comp_site_resize, comp_site); + evas_object_event_callback_add(e_comp->canvas->resize_object, EVAS_CALLBACK_RESIZE, _comp_site_resize, comp_site); evas_object_layer_set(comp_site, E_LAYER_DESKTOP); evas_object_resize(comp_site, e_comp->w, e_comp->h); }