M ChangeLog → ChangeLog

@@ -1,6 +1,8 @@ 
  (Format: Year/Month/Day)
 Changes for 1.0.0:
 *07/06/30:
+   * Fixed the groups file, even though it's deprecated (Mark)
+     Workspace.cc Screen.cc
    * Fix _NET_WM_STATE_DEMANDS_ATTENTION with tabbed windows, #1732392 (Mark)
      Ewmh.cc/hh
 *07/06/29:

M src/Screen.cc → src/Screen.cc

@@ -1465,6 +1465,10 @@ if (!win->isManaged()) {
                 delete win;
                 return 0;
             }
+
+            Workspace *workspace = getWorkspace(win->workspaceNumber());
+            if (workspace && !Fluxbox::instance()->isStartup())
+                workspace->checkGrouping(*win);
         }
     }
 

M src/Workspace.cc → src/Workspace.cc

@@ -326,8 +326,10 @@ break; // try next name
 #ifdef DEBUG
                     cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<<endl;
 #endif // DEBUG
-                    (*wit)->attachClient(win.winClient());
-                    (*wit)->raise();
+                    WinClient &client = win.winClient();
+                    (*wit)->attachClient(client);
+                    if (client.screen().focusControl().focusNew())
+                        (*wit)->setCurrentClient(client);
                     return true; // grouping done
 
                 }