aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-27 13:03:04 (GMT)
committerfluxgen <fluxgen>2002-11-27 13:03:04 (GMT)
commit2f70830cbc53b43fcc92e925e55311cfb780d1e4 (patch)
tree0a4d58b2f0475945eb179d84a617f2e21bd8842b
parent5a699db18fd77565f6127cf6502c0c32f4658f45 (diff)
downloadfluxbox_paul-2f70830cbc53b43fcc92e925e55311cfb780d1e4.zip
fluxbox_paul-2f70830cbc53b43fcc92e925e55311cfb780d1e4.tar.bz2
toolbar changes
-rw-r--r--src/Screen.cc6
-rw-r--r--src/Tab.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 1d885be..b3925c9 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.84 2002/11/25 14:07:21 fluxgen Exp $ 25// $Id: Screen.cc,v 1.85 2002/11/27 13:01:28 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -986,13 +986,13 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) {
986#endif // SLIT 986#endif // SLIT
987 987
988 session_stack[i++] = 988 session_stack[i++] =
989 m_toolbar->getMenu()->getPlacementmenu()->windowID(); 989 m_toolbar->menu().placementmenu()->windowID();
990#ifdef XINERAMA 990#ifdef XINERAMA
991 if (hasXinerama()) { 991 if (hasXinerama()) {
992 session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID(); 992 session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID();
993 } 993 }
994#endif // XINERAMA 994#endif // XINERAMA
995 session_stack[i++] = m_toolbar->getMenu()->windowID(); 995 session_stack[i++] = m_toolbar->menu().windowID();
996 996
997 Rootmenus::iterator rit = rootmenuList.begin(); 997 Rootmenus::iterator rit = rootmenuList.begin();
998 Rootmenus::iterator rit_end = rootmenuList.end(); 998 Rootmenus::iterator rit_end = rootmenuList.end();
diff --git a/src/Tab.cc b/src/Tab.cc
index b2c0a3a..d8ebcfb 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.cc,v 1.43 2002/11/26 16:40:57 fluxgen Exp $ 22// $Id: Tab.cc,v 1.44 2002/11/27 13:03:04 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -842,7 +842,7 @@ void Tab::motionNotifyEvent(XMotionEvent *me) {
842 case Toolbar::TOPLEFT: 842 case Toolbar::TOPLEFT:
843 case Toolbar::TOPCENTER: 843 case Toolbar::TOPCENTER:
844 case Toolbar::TOPRIGHT: 844 case Toolbar::TOPRIGHT:
845 dtty = m_win->getScreen()->getToolbar()->getExposedHeight() + 845 dtty = m_win->getScreen()->getToolbar()->exposedHeight() +
846 m_win->getScreen()->getBorderWidth(); 846 m_win->getScreen()->getBorderWidth();
847 dbby = m_win->getScreen()->getHeight(); 847 dbby = m_win->getScreen()->getHeight();
848 break; 848 break;