diff options
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Window.cc b/src/Window.cc index 3ec9543..f0a64bb 100644 --- a/src/Window.cc +++ b/src/Window.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: Window.cc,v 1.102 2002/11/26 16:44:48 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.103 2002/11/27 14:00:44 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -1739,7 +1739,7 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
1739 | case Toolbar::TOPLEFT: | 1739 | case Toolbar::TOPLEFT: |
1740 | case Toolbar::TOPCENTER: | 1740 | case Toolbar::TOPCENTER: |
1741 | case Toolbar::TOPRIGHT: | 1741 | case Toolbar::TOPRIGHT: |
1742 | slitModT -= screen->getToolbar()->getExposedHeight() + | 1742 | slitModT -= screen->getToolbar()->exposedHeight() + |
1743 | screen->getBorderWidth(); | 1743 | screen->getBorderWidth(); |
1744 | break; | 1744 | break; |
1745 | default: | 1745 | default: |
@@ -1752,7 +1752,7 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
1752 | case Toolbar::BOTTOMLEFT: | 1752 | case Toolbar::BOTTOMLEFT: |
1753 | case Toolbar::BOTTOMCENTER: | 1753 | case Toolbar::BOTTOMCENTER: |
1754 | case Toolbar::BOTTOMRIGHT: | 1754 | case Toolbar::BOTTOMRIGHT: |
1755 | slitModB -= screen->getToolbar()->getExposedHeight() + | 1755 | slitModB -= screen->getToolbar()->exposedHeight() + |
1756 | screen->getBorderWidth(); | 1756 | screen->getBorderWidth(); |
1757 | break; | 1757 | break; |
1758 | default: | 1758 | default: |
@@ -1800,15 +1800,15 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
1800 | // is the toolbar on this head? | 1800 | // is the toolbar on this head? |
1801 | if ((screen->getToolbarOnHead() == (signed) head) || | 1801 | if ((screen->getToolbarOnHead() == (signed) head) || |
1802 | (screen->getToolbarOnHead() < 0)) { | 1802 | (screen->getToolbarOnHead() < 0)) { |
1803 | dh -= screen->getToolbar()->getExposedHeight() + | 1803 | dh -= screen->getToolbar()->exposedHeight() + |
1804 | screen->getBorderWidth2x(); | 1804 | screen->getBorderWidth2x(); |
1805 | } | 1805 | } |
1806 | } else { | 1806 | } else { |
1807 | dh -= screen->getToolbar()->getExposedHeight() + | 1807 | dh -= screen->getToolbar()->exposedHeight() + |
1808 | screen->getBorderWidth2x(); | 1808 | screen->getBorderWidth2x(); |
1809 | } | 1809 | } |
1810 | #else // !XINERAMA | 1810 | #else // !XINERAMA |
1811 | dh -= screen->getToolbar()->getExposedHeight() + | 1811 | dh -= screen->getToolbar()->exposedHeight() + |
1812 | screen->getBorderWidth2x(); | 1812 | screen->getBorderWidth2x(); |
1813 | #endif // XINERAMA | 1813 | #endif // XINERAMA |
1814 | } | 1814 | } |
@@ -1852,7 +1852,7 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
1852 | if ((screen->getToolbarOnHead() == (signed) head) || | 1852 | if ((screen->getToolbarOnHead() == (signed) head) || |
1853 | (screen->getToolbarOnHead() < 0)) { | 1853 | (screen->getToolbarOnHead() < 0)) { |
1854 | dy += (((screen->getHeadHeight(head) + slitModT - slitModB | 1854 | dy += (((screen->getHeadHeight(head) + slitModT - slitModB |
1855 | - (screen->getToolbar()->getExposedHeight())) - dh) / 2) | 1855 | - (screen->getToolbar()->exposedHeight())) - dh) / 2) |
1856 | - screen->getBorderWidth2x(); | 1856 | - screen->getBorderWidth2x(); |
1857 | } else { | 1857 | } else { |
1858 | dy += ((screen->getHeadHeight(head) + slitModT - slitModB - dh) / 2) - | 1858 | dy += ((screen->getHeadHeight(head) + slitModT - slitModB - dh) / 2) - |
@@ -1860,11 +1860,11 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
1860 | } | 1860 | } |
1861 | } else { // no xinerama | 1861 | } else { // no xinerama |
1862 | dy = (((screen->getHeight() + slitModT - slitModB - | 1862 | dy = (((screen->getHeight() + slitModT - slitModB - |
1863 | (screen->getToolbar()->getExposedHeight())) - dh) / 2) - | 1863 | (screen->getToolbar()->exposedHeight())) - dh) / 2) - |
1864 | screen->getBorderWidth2x(); | 1864 | screen->getBorderWidth2x(); |
1865 | } | 1865 | } |
1866 | #else // !XINERAMA | 1866 | #else // !XINERAMA |
1867 | dy = (((screen->getHeight() + slitModT - slitModB - (screen->getToolbar()->getExposedHeight())) | 1867 | dy = (((screen->getHeight() + slitModT - slitModB - (screen->getToolbar()->exposedHeight())) |
1868 | - dh) / 2) - screen->getBorderWidth2x(); | 1868 | - dh) / 2) - screen->getBorderWidth2x(); |
1869 | #endif // XINERAMA | 1869 | #endif // XINERAMA |
1870 | 1870 | ||
@@ -1877,11 +1877,11 @@ void FluxboxWindow::maximize(unsigned int button) { | |||
1877 | if (!screen->hasXinerama() || | 1877 | if (!screen->hasXinerama() || |
1878 | (screen->getToolbarOnHead() == (signed) head) || | 1878 | (screen->getToolbarOnHead() == (signed) head) || |
1879 | (screen->getToolbarOnHead() < 0)) { | 1879 | (screen->getToolbarOnHead() < 0)) { |
1880 | dy += screen->getToolbar()->getExposedHeight() + | 1880 | dy += screen->getToolbar()->exposedHeight() + |
1881 | screen->getBorderWidth2x(); | 1881 | screen->getBorderWidth2x(); |
1882 | } | 1882 | } |
1883 | #else // !XINERAMA | 1883 | #else // !XINERAMA |
1884 | dy += screen->getToolbar()->getExposedHeight() + | 1884 | dy += screen->getToolbar()->exposedHeight() + |
1885 | screen->getBorderWidth2x(); | 1885 | screen->getBorderWidth2x(); |
1886 | #endif // XINERAMA | 1886 | #endif // XINERAMA |
1887 | break; | 1887 | break; |
@@ -2968,7 +2968,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) { | |||
2968 | case Toolbar::TOPLEFT: | 2968 | case Toolbar::TOPLEFT: |
2969 | case Toolbar::TOPCENTER: | 2969 | case Toolbar::TOPCENTER: |
2970 | case Toolbar::TOPRIGHT: | 2970 | case Toolbar::TOPRIGHT: |
2971 | dtty = screen->getToolbar()->getExposedHeight() + | 2971 | dtty = screen->getToolbar()->exposedHeight() + |
2972 | screen->getBorderWidth(); | 2972 | screen->getBorderWidth(); |
2973 | dbby = screen->getHeight(); | 2973 | dbby = screen->getHeight(); |
2974 | break; | 2974 | break; |