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

getting workspace name directly in constructor

Browse source
This commit is contained in:
fluxgen 2003-06-12 14:30:01 +00:00
parent e9ae291109
commit fa254cccd4
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Workspace.cc
View file

@ -22,11 +22,11 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Workspace.cc,v 1.70 2003/06/05 13:21:10 rathnor Exp $ // $Id: Workspace.cc,v 1.71 2003/06/12 14:30:00 fluxgen Exp $
#include "Workspace.hh" #include "Workspace.hh"
#include "i18n.hh" #include "I18n.hh"
#include "fluxbox.hh" #include "fluxbox.hh"
#include "Screen.hh" #include "Screen.hh"
#include "Window.hh" #include "Window.hh"
@ -113,24 +113,23 @@ private:
Workspace::GroupList Workspace::m_groups; Workspace::GroupList Workspace::m_groups;
Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager, unsigned int i): Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
const std::string &name, unsigned int i):
m_screen(scrn), m_screen(scrn),
m_lastfocus(0), m_lastfocus(0),
m_clientmenu(*scrn.menuTheme(), scrn.screenNumber(), scrn.imageControl()), m_clientmenu(*scrn.menuTheme(), scrn.screenNumber(), scrn.imageControl()),
m_layermanager(layermanager), m_layermanager(layermanager),
m_name(""), m_name(name),
m_id(i) { m_id(i) {
m_cascade_x = new int[scrn.numHeads()+1]; m_cascade_x = new int[scrn.numHeads() + 1];
m_cascade_y = new int[scrn.numHeads()+1]; m_cascade_y = new int[scrn.numHeads() + 1];
for (int i=0; i < scrn.numHeads()+1; i++) { for (int i=0; i < scrn.numHeads()+1; i++) {
m_cascade_x[i] = 32 + scrn.getHeadX(i); m_cascade_x[i] = 32 + scrn.getHeadX(i);
m_cascade_y[i] = 32 + scrn.getHeadY(i); m_cascade_y[i] = 32 + scrn.getHeadY(i);
} }
m_clientmenu.setInternalMenu(); m_clientmenu.setInternalMenu();
setName(screen().getNameOfWorkspace(m_id));
} }

2
src/Workspace.hh
View file

@ -47,7 +47,7 @@ class Workspace:private FbTk::NotCopyable {
public: public:
typedef std::vector<FluxboxWindow *> Windows; typedef std::vector<FluxboxWindow *> Windows;
Workspace(BScreen &screen, FbTk::MultLayers &layermanager, Workspace(BScreen &screen, FbTk::MultLayers &layermanager, const std::string &name,
unsigned int workspaceid = 0); unsigned int workspaceid = 0);
~Workspace(); ~Workspace();