aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2006-02-20 21:04:35 (GMT)
committerfluxgen <fluxgen>2006-02-20 21:04:35 (GMT)
commit369b4e1b92491aa57b0bf430b89bf732b80fa6a4 (patch)
tree2bf00a93ad1c195ef7d446e8989069f218a2cd47 /src/Window.cc
parent2566d84561ce9f5ecaf1adcce97eb578747034e3 (diff)
downloadfluxbox-369b4e1b92491aa57b0bf430b89bf732b80fa6a4.zip
fluxbox-369b4e1b92491aa57b0bf430b89bf732b80fa6a4.tar.bz2
moved class Layer from class Fluxbox and thus reduces some dependecies
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index e6db450..fbec829 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -41,6 +41,7 @@
41#include "MenuCreator.hh" 41#include "MenuCreator.hh"
42#include "StringUtil.hh" 42#include "StringUtil.hh"
43#include "FocusControl.hh" 43#include "FocusControl.hh"
44#include "Layer.hh"
44 45
45#include "FbTk/TextButton.hh" 46#include "FbTk/TextButton.hh"
46#include "FbTk/Compose.hh" 47#include "FbTk/Compose.hh"
@@ -1595,7 +1596,7 @@ void FluxboxWindow::setFullscreen(bool flag) {
1595 // be xinerama aware 1596 // be xinerama aware
1596 moveResize(screen().getHeadX(head), screen().getHeadY(head), 1597 moveResize(screen().getHeadX(head), screen().getHeadY(head),
1597 screen().getHeadWidth(head), screen().getHeadHeight(head)); 1598 screen().getHeadWidth(head), screen().getHeadHeight(head));
1598 moveToLayer(Fluxbox::instance()->getAboveDockLayer()); 1599 moveToLayer(::Layer::ABOVE_DOCK);
1599 1600
1600 fullscreen = true; 1601 fullscreen = true;
1601 1602
@@ -1612,7 +1613,7 @@ void FluxboxWindow::setFullscreen(bool flag) {
1612 moveToLayer(m_old_layernum); 1613 moveToLayer(m_old_layernum);
1613 1614
1614 m_old_decoration_mask = 0; 1615 m_old_decoration_mask = 0;
1615 m_old_layernum = Fluxbox::instance()->getNormalLayer(); 1616 m_old_layernum = ::Layer::NORMAL;
1616 1617
1617 stateSig().notify(); 1618 stateSig().notify();
1618 } 1619 }
@@ -1886,7 +1887,7 @@ void FluxboxWindow::tempRaise() {
1886 1887
1887void FluxboxWindow::raiseLayer() { 1888void FluxboxWindow::raiseLayer() {
1888 // don't let it up to menu layer 1889 // don't let it up to menu layer
1889 if (layerNum() == (Fluxbox::instance()->getMenuLayer()+1)) 1890 if (layerNum() == ::Layer::MENU + 1)
1890 return; 1891 return;
1891 1892
1892 if (!isInitialized()) { 1893 if (!isInitialized()) {
@@ -1968,11 +1969,9 @@ void FluxboxWindow::moveToLayer(int layernum) {
1968 cerr<<"FluxboxWindow("<<title()<<")::moveToLayer("<<layernum<<")"<<endl; 1969 cerr<<"FluxboxWindow("<<title()<<")::moveToLayer("<<layernum<<")"<<endl;
1969#endif // DEBUG 1970#endif // DEBUG
1970 1971
1971 Fluxbox * fluxbox = Fluxbox::instance();
1972
1973 // don't let it set its layer into menu area 1972 // don't let it set its layer into menu area
1974 if (layernum <= fluxbox->getMenuLayer()) { 1973 if (layernum <= ::Layer::MENU) {
1975 layernum = fluxbox->getMenuLayer() + 1; 1974 layernum = ::Layer::MENU + 1;
1976 } 1975 }
1977 1976
1978 if (!isInitialized()) { 1977 if (!isInitialized()) {