set border props in border props setting function, only set sticky if entry is not...
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 28 Aug 2012 07:20:31 +0000 (07:20 +0000)
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 28 Aug 2012 07:20:31 +0000 (07:20 +0000)
ticket #cedric

SVN revision: 75756

src/modules/quickaccess/e_mod_quickaccess.c

index 5e97f55..e0d6331 100644 (file)
@@ -210,6 +210,8 @@ _e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry)
    
    if (entry->config.autohide && (!entry->border->focused))
      _e_qa_border_deactivate(entry);
+#define SET(X) \
+   entry->border->X = 1
    if (entry->config.jump)
      {
         entry->border->client.netwm.state.skip_taskbar = 0;
@@ -218,11 +220,19 @@ _e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry)
    else
      {
         if (qa_config->skip_taskbar)
-          entry->border->client.netwm.state.skip_taskbar = 1;
+          SET(client.netwm.state.skip_taskbar);
         if (qa_config->skip_pager)
-          entry->border->client.netwm.state.skip_pager = 1;
+          SET(client.netwm.state.skip_pager);
+        SET(sticky);
      }
-   entry->border->changed = 1;
+   //bd->client.e.state.centered = 1;
+   SET(lock_user_iconify);
+   SET(lock_client_iconify);
+   SET(lock_user_sticky);
+   SET(lock_client_sticky);
+   SET(user_skip_winlist);
+   SET(changed);
+#undef SET
 }
 
 static void
@@ -230,23 +240,7 @@ _e_qa_entry_border_associate(E_Quick_Access_Entry *entry, E_Border *bd)
 {
    if (entry->exe) entry->exe = NULL;  /* not waiting anymore */
 
-   if (!entry->border)
-     {
-        entry->border = bd;
-
-#define SET(X) \
-   bd->X = 1
-
-        SET(lock_user_iconify);
-        SET(lock_client_iconify);
-        SET(lock_user_sticky);
-        SET(lock_client_sticky);
-        SET(user_skip_winlist);
-        SET(sticky);
-#undef SET
-
-        //bd->client.e.state.centered = 1;
-     }
+   entry->border = bd;
    /* FIXME: doesn't work, causes window to flicker on associate
    if (entry->config.hidden)
      _e_qa_border_deactivate(entry);