rename bg_blank_object -> resize_object for a more accurate name

devs/bu5hm4n/meson_wip
Mike Blumenkrantz 5 years ago
parent 35b1d20b81
commit 263ee54545
  1. 2
      src/bin/e_comp.c
  2. 2
      src/bin/e_comp.h
  3. 6
      src/bin/e_comp_canvas.c
  4. 2
      src/bin/e_comp_x.c
  5. 2
      src/bin/e_gadget.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;

@ -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

@ -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

@ -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

@ -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);
}

Loading…
Cancel
Save