fix some misbehaving settings in the apps file
markt markt
2 files changed,
12 insertions(+),
4 deletions(-)
M
ChangeLog
→
ChangeLog
@@ -1,5 +1,10 @@
(Format: Year/Month/Day) Changes for 1.0rc3: +*06/12/27: + * Don't assume "Jump" and "*Hidden" say "yes" in apps file (Mark) + * Jump to autogrouped windows on another workspace if set to do so in + apps file (Mark) + Remember.cc *06/12/20: * Fixed a few bugs with tabbed windows on restart (Mark) Window.cc FocusControl.hh
M
src/Remember.cc
→
src/Remember.cc
@@ -772,7 +772,7 @@ }
if (a.focushiddenstate_remember || a.iconhiddenstate_remember) { if (a.focushiddenstate_remember && a.iconhiddenstate_remember && - a.focushiddenstate && a.iconhiddenstate) + a.focushiddenstate == a.iconhiddenstate) apps_file << " [Hidden]\t{" << ((a.focushiddenstate)?"yes":"no") << "}" << endl; else if (a.focushiddenstate_remember) { apps_file << " [FocusHidden]\t{" << ((a.focushiddenstate)?"yes":"no") << "}" << endl;@@ -981,9 +981,9 @@ if (app->is_grouped && app->group == 0 && leftwin == None)
app->group = &win; if (app->focushiddenstate_remember) - win.setFocusHidden(true); + win.setFocusHidden(app->focushiddenstate); if (app->iconhiddenstate_remember) - win.setIconHidden(true); + win.setIconHidden(app->iconhiddenstate); if (app->layer_remember) win.moveToLayer(app->layer); if (app->decostate_remember)@@ -998,7 +998,7 @@
if (app->workspace_remember) { // we use setWorkspace and not reassoc because we're still initialising win.setWorkspace(app->workspace); - if (app->jumpworkspace_remember) + if (app->jumpworkspace_remember && app->jumpworkspace) screen.changeWorkspaceID(app->workspace); }@@ -1070,6 +1070,9 @@ return; // nothing to do
if (winclient.fbwindow() == 0 && app->is_grouped && app->group) { app->group->attachClient(winclient); + if (app->jumpworkspace_remember && app->jumpworkspace) + // jump to window, not saved workspace + winclient.screen().changeWorkspaceID(app->group->workspaceNumber()); } }