optimize out re-applying of borderless client theme

This commit is contained in:
Mike Blumenkrantz 2016-10-28 10:36:21 -04:00
parent c6b091980a
commit 420b54a151
2 changed files with 4 additions and 2 deletions

View File

@ -4347,12 +4347,13 @@ e_client_border_set(E_Client *ec, const char *name)
if (ec->border.changed) if (ec->border.changed)
CRI("CALLING WHEN border.changed SET!"); CRI("CALLING WHEN border.changed SET!");
if (!e_util_strcmp(ec->border.name, name)) return EINA_TRUE; if (eina_streq(ec->border.name, name)) return EINA_TRUE;
if (ec->mwm.borderless && name && strcmp(name, "borderless")) if (ec->mwm.borderless && (!eina_streq(name, "borderless")))
{ {
e_util_dialog_show(_("Client Error!"), _("Something has attempted to set a border when it shouldn't! Report this!")); e_util_dialog_show(_("Client Error!"), _("Something has attempted to set a border when it shouldn't! Report this!"));
CRI("border change attempted for MWM borderless client!"); CRI("border change attempted for MWM borderless client!");
} }
if ((!ec->border.name) && eina_streq(name, "borderless")) return EINA_TRUE;
pborder = ec->border.name; pborder = ec->border.name;
ec->border.name = eina_stringshare_add(name); ec->border.name = eina_stringshare_add(name);
if (e_comp_object_frame_theme_set(ec->frame, name)) if (e_comp_object_frame_theme_set(ec->frame, name))

View File

@ -3315,6 +3315,7 @@ e_comp_object_frame_theme_set(Evas_Object *obj, const char *name)
return edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->frame_object ?: cw->obj); return edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->frame_object ?: cw->obj);
if (!e_util_strcmp(name, "COMP_RESHADOW")) if (!e_util_strcmp(name, "COMP_RESHADOW"))
return _e_comp_object_shadow_setup(cw); return _e_comp_object_shadow_setup(cw);
if (eina_streq(name, "borderless") && (!cw->frame_object)) return EINA_TRUE;
pbg = cw->frame_object; pbg = cw->frame_object;
theme = eina_stringshare_add(name); theme = eina_stringshare_add(name);