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

update workspace names on reconfig, and don't truncate list of names when writing rc

Browse source
This commit is contained in:
markt 2007-02-17 17:39:00 +00:00
parent 58eb385351
commit 2f130ce836
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,9 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0rc3: Changes for 1.0rc3:
*07/02/17: *07/02/17:
* Update workspace names on reconfigure, and don't overwrite workspace names
not being used (Mark)
fluxbox.cc Screen.cc
* Fixed some issues with transients of inactive tabs (Mark) * Fixed some issues with transients of inactive tabs (Mark)
Window.cc Window.cc
*07/02/10: *07/02/10:

3
src/Screen.cc
View file

@ -1503,6 +1503,9 @@ void BScreen::updateAvailableWorkspaceArea() {
void BScreen::addWorkspaceName(const char *name) { void BScreen::addWorkspaceName(const char *name) {
m_workspace_names.push_back(FbTk::FbStringUtil::LocaleStrToFb(name)); m_workspace_names.push_back(FbTk::FbStringUtil::LocaleStrToFb(name));
Workspace *wkspc = getWorkspace(m_workspace_names.size()-1);
if (wkspc)
wkspc->setName(m_workspace_names.back());
} }

8
src/fluxbox.cc
View file

@ -1506,11 +1506,9 @@ void Fluxbox::save_rc() {
sprintf(rc_string, "session.screen%d.workspaceNames: ", screen_number); sprintf(rc_string, "session.screen%d.workspaceNames: ", screen_number);
string workspaces_string(rc_string); string workspaces_string(rc_string);
for (unsigned int workspace=0; workspace < screen->numberOfWorkspaces(); workspace++) { const vector<string> names = screen->getWorkspaceNames();
if (screen->getWorkspace(workspace)->name().size()!=0) for (size_t i=0; i < names.size(); i++) {
workspaces_string.append(FbTk::FbStringUtil::FbStrToLocale(screen->getWorkspace(workspace)->name())); workspaces_string.append(FbTk::FbStringUtil::FbStrToLocale(names[i]));
else
workspaces_string.append("Null");
workspaces_string.append(","); workspaces_string.append(",");
} }