nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a little fix for auto-grouping after restart

Browse source
This commit is contained in:
markt 2006-08-05 05:21:15 +00:00
parent c65b949f97
commit 721c02204a
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Remember.cc
View file

@ -965,7 +965,8 @@ void Remember::setupFrame(FluxboxWindow &win) {
// first, set the options that aren't preserved as window properties on
// restart, then return if fluxbox is starting up -- we want restart to
// disturb the current window state as little as possible
if (app->is_grouped && app->group == 0)
Window leftwin = winclient.getGroupLeftWindow();
if (app->is_grouped && app->group == 0 && leftwin == None)
app->group = &win;
if (app->focushiddenstate_remember)

8
src/Screen.cc
View file

@ -2073,11 +2073,9 @@ WinClient *BScreen::findGroupRight(WinClient &winclient) {
WinClient *other = it->second;
m_expecting_groups.erase(it); // don't expect it anymore
// forget about it if it isn't the left-most client in the group, plus
// it must have the atom set on it (i.e. previously encountered by fluxbox)
// for us to check our expecting
if (!winclient.hasGroupLeftWindow() ||
other->getGroupLeftWindow() != None)
// forget about it if it isn't the left-most client in the group
Window leftwin = other->getGroupLeftWindow();
if (leftwin != None && leftwin != winclient.window())
return 0;
return other;

3
src/Window.cc
View file

@ -386,7 +386,8 @@ void FluxboxWindow::init() {
assert(m_client);
m_client->setFluxboxWindow(this);
m_client->setGroupLeftWindow(None); // nothing to the left.
if (!m_client->hasGroupLeftWindow())
m_client->setGroupLeftWindow(None); // nothing to the left.
// check for shape extension and whether the window is shaped
m_shaped = false;