block border-affecting client functions for csd clients
authorMike Blumenkrantz <zmike@osg.samsung.com>
Thu, 24 Sep 2015 20:02:44 +0000 (16:02 -0400)
committerMike Blumenkrantz <zmike@osg.samsung.com>
Thu, 24 Sep 2015 20:33:56 +0000 (16:33 -0400)
src/bin/e_actions.c
src/bin/e_client.c

index ae8a3cecc57b61f7177eabedd3f30e348f9fbc57..3d8d2c4cb6a3ac6042af187c88250cafca2d3fed 100644 (file)
@@ -732,6 +732,7 @@ ACT_FN_GO(window_shaded, )
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         if (params)
           {
              int v;
@@ -777,6 +778,7 @@ ACT_FN_GO(window_borderless_toggle, EINA_UNUSED)
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         ec->borderless = !ec->borderless;
 
         ec->border.changed = 1;
@@ -795,6 +797,7 @@ ACT_FN_GO(window_border_set, EINA_UNUSED)
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         if (ec && params)
           {
              eina_stringshare_replace(&ec->bordername, params);
@@ -815,6 +818,7 @@ ACT_FN_GO(window_border_cycle, EINA_UNUSED)
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         if (ec && params)
           {
              const char *space;
index c001eddc1f3fdb85f8687d51f6774b2f4d4281a2..85b463a56bdb655ade79fa30f292768275217f13 100644 (file)
@@ -3662,6 +3662,7 @@ e_client_shade(E_Client *ec, E_Direction dir)
    if ((ec->shaded) || (ec->shading) || (ec->fullscreen) ||
        ((ec->maximized) && (!e_config->allow_manip))) return;
    if (!e_util_strcmp("borderless", ec->bordername)) return;
+   if (!e_comp_object_frame_allowed(ec->frame)) return;
 
    e_hints_window_shaded_set(ec, 1);
    e_hints_window_shade_direction_set(ec, dir);
@@ -4194,6 +4195,7 @@ e_client_border_set(E_Client *ec, const char *name)
 
    E_OBJECT_CHECK_RETURN(ec, EINA_FALSE);
    E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, EINA_FALSE);
+   if (!e_comp_object_frame_allowed(ec->frame)) return EINA_FALSE;
    if (ec->border.changed)
      CRI("CALLING WHEN border.changed SET!");