--- a/TabWidget.st Sat Oct 11 14:01:19 1997 +0200
+++ b/TabWidget.st Sat Oct 11 14:20:07 1997 +0200
@@ -466,7 +466,7 @@
"return true, if the intersection between the tab widget and
the argument, aRectangle is not empty
"
- |origin corner direction v1 v2|
+ |origin corner direction irect|
origin := self computeOrigin.
corner := self computeCorner.
@@ -474,17 +474,20 @@
direction := tabView direction.
direction == #top ifTrue:[
- ^ aRectangle intersects:(Rectangle origin:origin corner:corner)
- ].
- direction == #bottom ifTrue:[
- ^ aRectangle intersects:(Rectangle origin:(origin x @ corner y) corner:(corner x @ origin y))
+ irect := (Rectangle origin:origin corner:corner)
+ ] ifFalse:[
+ direction == #bottom ifTrue:[
+ irect := (Rectangle origin:(origin x @ corner y) corner:(corner x @ origin y))
+ ] ifFalse:[
+ direction == #right ifTrue:[
+ irect := (Rectangle origin:(corner x @ origin y) corner:(origin x @ corner y))
+ ] ifFalse:[
+ irect := (Rectangle origin:origin corner:corner)
+ ]
+ ]
].
- direction == #right ifTrue:[
- ^ aRectangle intersects:(Rectangle origin:(corner x @ origin y) corner:(origin x @ corner y))
- ].
-
- ^ aRectangle intersects:(Rectangle origin:origin corner:corner)
+ ^ aRectangle intersects:irect
! !
!TabWidget::Mac class methodsFor:'accessing'!
@@ -995,5 +998,5 @@
!TabWidget class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.11 1997-10-11 11:04:55 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/TabWidget.st,v 1.12 1997-10-11 12:20:07 cg Exp $'
! !