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

toolbar changes

Browse source
This commit is contained in:
fluxgen 2002-11-27 14:00:44 +00:00
parent 2f70830cbc
commit 146df03e73
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Window.cc
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: Window.cc,v 1.102 2002/11/26 16:44:48 fluxgen Exp $ // $Id: Window.cc,v 1.103 2002/11/27 14:00:44 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -1739,7 +1739,7 @@ void FluxboxWindow::maximize(unsigned int button) {
case Toolbar::TOPLEFT: case Toolbar::TOPLEFT:
case Toolbar::TOPCENTER: case Toolbar::TOPCENTER:
case Toolbar::TOPRIGHT: case Toolbar::TOPRIGHT:
slitModT -= screen->getToolbar()->getExposedHeight() + slitModT -= screen->getToolbar()->exposedHeight() +
screen->getBorderWidth(); screen->getBorderWidth();
break; break;
default: default:
@ -1752,7 +1752,7 @@ void FluxboxWindow::maximize(unsigned int button) {
case Toolbar::BOTTOMLEFT: case Toolbar::BOTTOMLEFT:
case Toolbar::BOTTOMCENTER: case Toolbar::BOTTOMCENTER:
case Toolbar::BOTTOMRIGHT: case Toolbar::BOTTOMRIGHT:
slitModB -= screen->getToolbar()->getExposedHeight() + slitModB -= screen->getToolbar()->exposedHeight() +
screen->getBorderWidth(); screen->getBorderWidth();
break; break;
default: default:
@ -1800,15 +1800,15 @@ void FluxboxWindow::maximize(unsigned int button) {
// is the toolbar on this head? // is the toolbar on this head?
if ((screen->getToolbarOnHead() == (signed) head) || if ((screen->getToolbarOnHead() == (signed) head) ||
(screen->getToolbarOnHead() < 0)) { (screen->getToolbarOnHead() < 0)) {
dh -= screen->getToolbar()->getExposedHeight() + dh -= screen->getToolbar()->exposedHeight() +
screen->getBorderWidth2x(); screen->getBorderWidth2x();
} }
} else { } else {
dh -= screen->getToolbar()->getExposedHeight() + dh -= screen->getToolbar()->exposedHeight() +
screen->getBorderWidth2x(); screen->getBorderWidth2x();
} }
#else // !XINERAMA #else // !XINERAMA
dh -= screen->getToolbar()->getExposedHeight() + dh -= screen->getToolbar()->exposedHeight() +
screen->getBorderWidth2x(); screen->getBorderWidth2x();
#endif // XINERAMA #endif // XINERAMA
} }
@ -1852,7 +1852,7 @@ void FluxboxWindow::maximize(unsigned int button) {
if ((screen->getToolbarOnHead() == (signed) head) || if ((screen->getToolbarOnHead() == (signed) head) ||
(screen->getToolbarOnHead() < 0)) { (screen->getToolbarOnHead() < 0)) {
dy += (((screen->getHeadHeight(head) + slitModT - slitModB dy += (((screen->getHeadHeight(head) + slitModT - slitModB
- (screen->getToolbar()->getExposedHeight())) - dh) / 2) - (screen->getToolbar()->exposedHeight())) - dh) / 2)
- screen->getBorderWidth2x(); - screen->getBorderWidth2x();
} else { } else {
dy += ((screen->getHeadHeight(head) + slitModT - slitModB - dh) / 2) - dy += ((screen->getHeadHeight(head) + slitModT - slitModB - dh) / 2) -
@ -1860,11 +1860,11 @@ void FluxboxWindow::maximize(unsigned int button) {
} }
} else { // no xinerama } else { // no xinerama
dy = (((screen->getHeight() + slitModT - slitModB - dy = (((screen->getHeight() + slitModT - slitModB -
(screen->getToolbar()->getExposedHeight())) - dh) / 2) - (screen->getToolbar()->exposedHeight())) - dh) / 2) -
screen->getBorderWidth2x(); screen->getBorderWidth2x();
} }
#else // !XINERAMA #else // !XINERAMA
dy = (((screen->getHeight() + slitModT - slitModB - (screen->getToolbar()->getExposedHeight())) dy = (((screen->getHeight() + slitModT - slitModB - (screen->getToolbar()->exposedHeight()))
- dh) / 2) - screen->getBorderWidth2x(); - dh) / 2) - screen->getBorderWidth2x();
#endif // XINERAMA #endif // XINERAMA
@ -1877,11 +1877,11 @@ void FluxboxWindow::maximize(unsigned int button) {
if (!screen->hasXinerama() || if (!screen->hasXinerama() ||
(screen->getToolbarOnHead() == (signed) head) || (screen->getToolbarOnHead() == (signed) head) ||
(screen->getToolbarOnHead() < 0)) { (screen->getToolbarOnHead() < 0)) {
dy += screen->getToolbar()->getExposedHeight() + dy += screen->getToolbar()->exposedHeight() +
screen->getBorderWidth2x(); screen->getBorderWidth2x();
} }
#else // !XINERAMA #else // !XINERAMA
dy += screen->getToolbar()->getExposedHeight() + dy += screen->getToolbar()->exposedHeight() +
screen->getBorderWidth2x(); screen->getBorderWidth2x();
#endif // XINERAMA #endif // XINERAMA
break; break;
@ -2968,7 +2968,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
case Toolbar::TOPLEFT: case Toolbar::TOPLEFT:
case Toolbar::TOPCENTER: case Toolbar::TOPCENTER:
case Toolbar::TOPRIGHT: case Toolbar::TOPRIGHT:
dtty = screen->getToolbar()->getExposedHeight() + dtty = screen->getToolbar()->exposedHeight() +
screen->getBorderWidth(); screen->getBorderWidth();
dbby = screen->getHeight(); dbby = screen->getHeight();
break; break;