toolbar changes

This commit is contained in:
fluxgen 2002-11-27 13:03:04 +00:00
parent 5a699db18f
commit 2f70830cbc
2 changed files with 5 additions and 5 deletions

View file

@ -22,7 +22,7 @@
// 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: Screen.cc,v 1.84 2002/11/25 14:07:21 fluxgen Exp $ // $Id: Screen.cc,v 1.85 2002/11/27 13:01:28 fluxgen Exp $
#include "Screen.hh" #include "Screen.hh"
@ -986,13 +986,13 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) {
#endif // SLIT #endif // SLIT
session_stack[i++] = session_stack[i++] =
m_toolbar->getMenu()->getPlacementmenu()->windowID(); m_toolbar->menu().placementmenu()->windowID();
#ifdef XINERAMA #ifdef XINERAMA
if (hasXinerama()) { if (hasXinerama()) {
session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID(); session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID();
} }
#endif // XINERAMA #endif // XINERAMA
session_stack[i++] = m_toolbar->getMenu()->windowID(); session_stack[i++] = m_toolbar->menu().windowID();
Rootmenus::iterator rit = rootmenuList.begin(); Rootmenus::iterator rit = rootmenuList.begin();
Rootmenus::iterator rit_end = rootmenuList.end(); Rootmenus::iterator rit_end = rootmenuList.end();

View file

@ -19,7 +19,7 @@
// 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: Tab.cc,v 1.43 2002/11/26 16:40:57 fluxgen Exp $ // $Id: Tab.cc,v 1.44 2002/11/27 13:03:04 fluxgen Exp $
#include "Tab.hh" #include "Tab.hh"
@ -842,7 +842,7 @@ void Tab::motionNotifyEvent(XMotionEvent *me) {
case Toolbar::TOPLEFT: case Toolbar::TOPLEFT:
case Toolbar::TOPCENTER: case Toolbar::TOPCENTER:
case Toolbar::TOPRIGHT: case Toolbar::TOPRIGHT:
dtty = m_win->getScreen()->getToolbar()->getExposedHeight() + dtty = m_win->getScreen()->getToolbar()->exposedHeight() +
m_win->getScreen()->getBorderWidth(); m_win->getScreen()->getBorderWidth();
dbby = m_win->getScreen()->getHeight(); dbby = m_win->getScreen()->getHeight();
break; break;