diff options
-rw-r--r-- | src/Slit.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index 4b04028..fe6711b 100644 --- a/src/Slit.cc +++ b/src/Slit.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: Slit.cc,v 1.22 2002/10/13 21:47:54 fluxgen Exp $ | 22 | // $Id: Slit.cc,v 1.23 2002/10/29 15:59:35 fluxgen Exp $ |
23 | 23 | ||
24 | //use GNU extensions | 24 | //use GNU extensions |
25 | #ifndef _GNU_SOURCE | 25 | #ifndef _GNU_SOURCE |
@@ -635,14 +635,14 @@ void Slit::reposition() { | |||
635 | break; | 635 | break; |
636 | } | 636 | } |
637 | 637 | ||
638 | Toolbar *tbar = screen->getToolbar(); | 638 | const Toolbar * const tbar = screen->getToolbar(); |
639 | int sw = frame.width + screen->getBorderWidth2x(), | 639 | int sw = frame.width + screen->getBorderWidth2x(), |
640 | sh = frame.height + screen->getBorderWidth2x(), | 640 | sh = frame.height + screen->getBorderWidth2x(), |
641 | tw = tbar->getWidth() + screen->getBorderWidth(), | 641 | tw = tbar->width() + screen->getBorderWidth(), |
642 | th = tbar->getHeight() + screen->getBorderWidth(); | 642 | th = tbar->height() + screen->getBorderWidth(); |
643 | 643 | ||
644 | if (tbar->getX() < frame.x + sw && tbar->getX() + tw > frame.x && | 644 | if (tbar->x() < frame.x + sw && tbar->x() + tw > frame.x && |
645 | tbar->getY() < frame.y + sh && tbar->getY() + th > frame.y) { | 645 | tbar->y() < frame.y + sh && tbar->y() + th > frame.y) { |
646 | if (frame.y < th) { | 646 | if (frame.y < th) { |
647 | frame.y += tbar->getExposedHeight(); | 647 | frame.y += tbar->getExposedHeight(); |
648 | if (screen->getSlitDirection() == VERTICAL) | 648 | if (screen->getSlitDirection() == VERTICAL) |