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

fix some misbehaving settings in the apps file

Browse source
This commit is contained in:
markt 2006-12-27 04:49:17 +00:00
parent 9d1447b0d5
commit e9f7c0f2c0
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

11
src/Remember.cc
View file

@ -772,7 +772,7 @@ void Remember::save() {
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 @@ void Remember::setupFrame(FluxboxWindow &win) {
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 @@ void Remember::setupFrame(FluxboxWindow &win) {
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 @@ void Remember::setupClient(WinClient &winclient) {
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());
}
}