Mercurial Mercurial > hg > stx-libwidg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkin from browser
authorClaus Gittinger <cg@exept.de>
Mon, 03 May 1999 23:33:39 +0200
changeset 1895 caa787828fcb
parent 1894 abf63db59265
child 1896 2e9c0db359ed
checkin from browser
ScrView.st file | annotate | diff | comparison | revisions
ScrollableView.st file | annotate | diff | comparison | revisions 
--- a/ScrView.st	Mon May 03 19:06:30 1999 +0200
+++ b/ScrView.st	Mon May 03 23:33:39 1999 +0200
@@ -1604,28 +1604,28 @@
 
     sBd := 0.
     DefaultScrolledViewBorderWidth notNil ifTrue:[
-	sBd := DefaultScrolledViewBorderWidth.
-	scrolledView notNil ifTrue:[
-	    scrolledView borderWidth:DefaultScrolledViewBorderWidth.
-	]
+        sBd := DefaultScrolledViewBorderWidth.
+        scrolledView notNil ifTrue:[
+            scrolledView borderWidth:DefaultScrolledViewBorderWidth.
+        ]
     ] ifFalse:[
-	scrolledView notNil ifTrue:[
-	    sBd := scrolledView borderWidth
-	]
+        scrolledView notNil ifTrue:[
+            sBd := scrolledView borderWidth
+        ]
     ].
 
     (hasV := (vScrollBar notNil and:[vScrollBarHidden not])) ifTrue:[
-	vBd := vScrollBar borderWidth.
-	wVScroll := vScrollBar widthIncludingBorder.
+        vBd := vScrollBar borderWidth.
+        wVScroll := vScrollBar widthIncludingBorder.
     ] ifFalse:[
-	vBd := wVScroll := 0.
+        vBd := wVScroll := 0.
     ].
 
     (hasH := (hScrollBar notNil and:[hScrollBarHidden not])) ifTrue:[
-	hBd := hScrollBar borderWidth.
-	hHScroll := hScrollBar heightIncludingBorder.
+        hBd := hScrollBar borderWidth.
+        hHScroll := hScrollBar heightIncludingBorder.
     ] ifFalse:[
-	hBd := hHScroll := 0.
+        hBd := hHScroll := 0.
     ].
 
     "/ the raw layout ...
@@ -1645,9 +1645,9 @@
     vTopOffs := 0 - vBd + scrolledViewMargin + margin.
 
     scrolledViewMargin == 0 ifTrue:[
-	vBottomOffs := vBd - scrolledViewMargin - sBd.
+        vBottomOffs := vBd - scrolledViewMargin - sBd.
     ] ifFalse:[
-	vBottomOffs := vBd - scrolledViewMargin + sBd.
+        vBottomOffs := vBd - scrolledViewMargin + sBd.
     ].
 
     hLeftOffs := 0 - hBd + scrolledViewMargin + margin.
@@ -1657,11 +1657,11 @@
     sRightOffs := hBd - scrolledViewMargin - sBd - sBd - sBd.
 
     scrolledViewMargin == 0 ifTrue:[
-	sTopOffs := 0 - sBd + margin.
-	sBottomOffs := sBd - sBd.
+        sTopOffs := 0 - sBd + margin.
+        sBottomOffs := sBd - sBd.
     ] ifFalse:[
-	sTopOffs := 0 + scrolledViewMargin + margin.
-	sBottomOffs := sBd - scrolledViewMargin - sBd - sBd - sBd.
+        sTopOffs := 0 + scrolledViewMargin + margin.
+        sBottomOffs := sBd - scrolledViewMargin - sBd - sBd - sBd.
     ].
 
 "/ kludge - for now
@@ -1678,89 +1678,103 @@
 "/    ].
 
     hasV ifTrue:[
-	scrollBarPosition == #right ifTrue:[
-	    "/ right/bottom
-	    vScrollBarLayout := ((1.0 @ 0.0) corner:(1.0@1.0)) asLayout.
+        scrollBarPosition == #right ifTrue:[
+            "/ right/bottom
+            vScrollBarLayout := ((1.0 @ 0.0) corner:(1.0@1.0)) asLayout.
 
-	    vRightOffs := 0 - scrolledViewMargin + margin "???".
-	    vLeftOffs := vRightOffs - wVScroll.
+            vRightOffs := 0 - scrolledViewMargin + margin "???".
+            vLeftOffs := vRightOffs - wVScroll.
 
-	    sRightOffs := sRightOffs - scrollBarSpacing - wVScroll + sBd.
+            sRightOffs := sRightOffs - scrollBarSpacing - wVScroll + sBd.
 
-	    hRightOffs := hRightOffs - wVScroll - scrollBarSpacing - sBd.
+            hRightOffs := hRightOffs - wVScroll - scrollBarSpacing - sBd.
 
-	    sRightOffs := sRightOffs - addMargin
-	] ifFalse:[
-	    "/ left/bottom
-	    vScrollBarLayout := ((0.0 @ 0.0) corner:(0.0@1.0)) asLayout.
+            sRightOffs := sRightOffs - addMargin
+        ] ifFalse:[
+            "/ left/bottom
+            vScrollBarLayout := ((0.0 @ 0.0) corner:(0.0@1.0)) asLayout.
 
-	    vLeftOffs := 0 - vBd + scrolledViewMargin + margin.
-	    vRightOffs := vLeftOffs + wVScroll + margin.
+            vLeftOffs := 0 - vBd + scrolledViewMargin + margin.
+            vRightOffs := vLeftOffs + wVScroll + margin.
 
-	    sLeftOffs := wVScroll + scrolledViewMargin + scrollBarSpacing + margin.
-	    sRightOffs := 0 - scrolledViewMargin - margin.
-	    hLeftOffs := hLeftOffs + wVScroll + vBd + scrollBarSpacing.
+            sLeftOffs := wVScroll + scrolledViewMargin + scrollBarSpacing + margin.
+            sRightOffs := 0 - scrolledViewMargin - margin.
+            hLeftOffs := hLeftOffs + wVScroll + vBd + scrollBarSpacing.
 
-	    sLeftOffs := sLeftOffs + addMargin
-	].
+            sLeftOffs := sLeftOffs + addMargin
+        ].
     ].
 
     hasH ifTrue:[
-	hBottomOffs := 0 - scrolledViewMargin - hBd + margin "???".
-	hTopOffs := hBottomOffs - hHScroll.
-	scrolledViewMargin == 0 ifTrue:[
-	    hTopOffs := hTopOffs + sBd + sBd
-	].
-	sBottomOffs := sBottomOffs - scrollBarSpacing - hHScroll.
-	(vScrollBar notNil and:[vScrollBarHidden not]) ifTrue:[
-	    vBottomOffs := vBottomOffs - scrollBarSpacing - hHScroll.
-	].
+        hBottomOffs := 0 - scrolledViewMargin - hBd + margin "???".
+        hTopOffs := hBottomOffs - hHScroll.
+        scrolledViewMargin == 0 ifTrue:[
+            hTopOffs := hTopOffs + sBd + sBd
+        ].
+        sBottomOffs := sBottomOffs - scrollBarSpacing - hHScroll.
+        (vScrollBar notNil and:[vScrollBarHidden not]) ifTrue:[
+            vBottomOffs := vBottomOffs - scrollBarSpacing - hHScroll.
+        ].
 
-	sBottomOffs := sBottomOffs - addMargin.
-	hRightOffs := hRightOffs - addMargin.
+        sBottomOffs := sBottomOffs - addMargin.
+        hRightOffs := hRightOffs - addMargin.
     ].
 
     (hScrollBar notNil
      and:[ hScrollBar borderWidth == 0 
      and:[sBd ~~ 0
      and:[scrollBarPosition == #right]]]) ifTrue:[
-	hRightOffs := hRightOffs + sBd + sBd.
+        hRightOffs := hRightOffs + sBd + sBd.
     ].
 
     scrolledView notNil ifTrue:[
-	scrolledViewLayout leftOffset:sLeftOffs.
-	scrolledViewLayout rightOffset:sRightOffs.
-	scrolledViewLayout topOffset:sTopOffs.
-	scrolledViewLayout bottomOffset:sBottomOffs.
+        scrolledViewLayout leftOffset:sLeftOffs.
+        scrolledViewLayout rightOffset:sRightOffs.
+        scrolledViewLayout topOffset:sTopOffs.
+        scrolledViewLayout bottomOffset:sBottomOffs.
 
-	configureScrolledView ifTrue:[
-	    ((hideVScrollBar or:[hideHScrollBar]) not
-	    and:[(hScrollBar isNil or:[hScrollBarHidden])
-	    and:[(vScrollBar isNil or:[vScrollBarHidden])]]) ifTrue:[
-		scrolledView level:0
-	    ] ifFalse:[
-		scrolledView level:DefaultScrolledViewLevel.
-	    ].
-	].
-	scrolledView layout:scrolledViewLayout.
+        configureScrolledView ifTrue:[
+            ((hideVScrollBar or:[hideHScrollBar]) not
+            and:[(hScrollBar isNil or:[hScrollBarHidden])
+            and:[(vScrollBar isNil or:[vScrollBarHidden])]]) ifTrue:[
+                scrolledView level:0
+            ] ifFalse:[
+                scrolledView level:DefaultScrolledViewLevel.
+            ].
+        ].
+        scrolledView layout:scrolledViewLayout.
     ].
     hasH ifTrue:[
-	hScrollBarLayout leftOffset:hLeftOffs.
-	hScrollBarLayout rightOffset:hRightOffs.
-	hScrollBarLayout topOffset:hTopOffs.
-	hScrollBarLayout bottomOffset:hBottomOffs.
+        hScrollBarLayout leftOffset:hLeftOffs.
+        hScrollBarLayout rightOffset:hRightOffs.
+        hScrollBarLayout topOffset:hTopOffs.
+        hScrollBarLayout bottomOffset:hBottomOffs.
 
-	hScrollBar level:DefaultScrollBarLevel.
-	hScrollBar layout:hScrollBarLayout
+        hScrollBar level:DefaultScrollBarLevel.
+        hScrollBar layout:hScrollBarLayout.
+
+"/        scrollBarPosition == #right ifTrue:[
+"/            "/ right/bottom
+"/            hScrollBar viewGravity:#SouthWest.
+"/        ] ifFalse:[
+"/            hScrollBar viewGravity:#NorthWest.
+"/        ]
     ].
     (vScrollBar notNil and:[vScrollBarHidden not]) ifTrue:[
-	vScrollBarLayout leftOffset:vLeftOffs.
-	vScrollBarLayout rightOffset:vRightOffs.
-	vScrollBarLayout topOffset:vTopOffs.
-	vScrollBarLayout bottomOffset:vBottomOffs.
+        vScrollBarLayout leftOffset:vLeftOffs.
+        vScrollBarLayout rightOffset:vRightOffs.
+        vScrollBarLayout topOffset:vTopOffs.
+        vScrollBarLayout bottomOffset:vBottomOffs.
 
-	vScrollBar level:DefaultScrollBarLevel.
-	vScrollBar layout:vScrollBarLayout
+        vScrollBar level:DefaultScrollBarLevel.
+        vScrollBar layout:vScrollBarLayout.
+
+"/        scrollBarPosition == #right ifTrue:[
+"/            "/ right/bottom
+"/            vScrollBar viewGravity:#NorthEast.
+"/        ] ifFalse:[
+"/            vScrollBar viewGravity:#NorthWest.
+"/        ]
     ].
 
     "Created: / 21.5.1998 / 00:48:35 / cg"
@@ -2050,5 +2064,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.94 1999-04-24 14:37:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.95 1999-05-03 21:33:39 cg Exp $'
 ! !
--- a/ScrollableView.st	Mon May 03 19:06:30 1999 +0200
+++ b/ScrollableView.st	Mon May 03 23:33:39 1999 +0200
@@ -1604,28 +1604,28 @@
 
     sBd := 0.
     DefaultScrolledViewBorderWidth notNil ifTrue:[
-	sBd := DefaultScrolledViewBorderWidth.
-	scrolledView notNil ifTrue:[
-	    scrolledView borderWidth:DefaultScrolledViewBorderWidth.
-	]
+        sBd := DefaultScrolledViewBorderWidth.
+        scrolledView notNil ifTrue:[
+            scrolledView borderWidth:DefaultScrolledViewBorderWidth.
+        ]
     ] ifFalse:[
-	scrolledView notNil ifTrue:[
-	    sBd := scrolledView borderWidth
-	]
+        scrolledView notNil ifTrue:[
+            sBd := scrolledView borderWidth
+        ]
     ].
 
     (hasV := (vScrollBar notNil and:[vScrollBarHidden not])) ifTrue:[
-	vBd := vScrollBar borderWidth.
-	wVScroll := vScrollBar widthIncludingBorder.
+        vBd := vScrollBar borderWidth.
+        wVScroll := vScrollBar widthIncludingBorder.
     ] ifFalse:[
-	vBd := wVScroll := 0.
+        vBd := wVScroll := 0.
     ].
 
     (hasH := (hScrollBar notNil and:[hScrollBarHidden not])) ifTrue:[
-	hBd := hScrollBar borderWidth.
-	hHScroll := hScrollBar heightIncludingBorder.
+        hBd := hScrollBar borderWidth.
+        hHScroll := hScrollBar heightIncludingBorder.
     ] ifFalse:[
-	hBd := hHScroll := 0.
+        hBd := hHScroll := 0.
     ].
 
     "/ the raw layout ...
@@ -1645,9 +1645,9 @@
     vTopOffs := 0 - vBd + scrolledViewMargin + margin.
 
     scrolledViewMargin == 0 ifTrue:[
-	vBottomOffs := vBd - scrolledViewMargin - sBd.
+        vBottomOffs := vBd - scrolledViewMargin - sBd.
     ] ifFalse:[
-	vBottomOffs := vBd - scrolledViewMargin + sBd.
+        vBottomOffs := vBd - scrolledViewMargin + sBd.
     ].
 
     hLeftOffs := 0 - hBd + scrolledViewMargin + margin.
@@ -1657,11 +1657,11 @@
     sRightOffs := hBd - scrolledViewMargin - sBd - sBd - sBd.
 
     scrolledViewMargin == 0 ifTrue:[
-	sTopOffs := 0 - sBd + margin.
-	sBottomOffs := sBd - sBd.
+        sTopOffs := 0 - sBd + margin.
+        sBottomOffs := sBd - sBd.
     ] ifFalse:[
-	sTopOffs := 0 + scrolledViewMargin + margin.
-	sBottomOffs := sBd - scrolledViewMargin - sBd - sBd - sBd.
+        sTopOffs := 0 + scrolledViewMargin + margin.
+        sBottomOffs := sBd - scrolledViewMargin - sBd - sBd - sBd.
     ].
 
 "/ kludge - for now
@@ -1678,89 +1678,103 @@
 "/    ].
 
     hasV ifTrue:[
-	scrollBarPosition == #right ifTrue:[
-	    "/ right/bottom
-	    vScrollBarLayout := ((1.0 @ 0.0) corner:(1.0@1.0)) asLayout.
+        scrollBarPosition == #right ifTrue:[
+            "/ right/bottom
+            vScrollBarLayout := ((1.0 @ 0.0) corner:(1.0@1.0)) asLayout.
 
-	    vRightOffs := 0 - scrolledViewMargin + margin "???".
-	    vLeftOffs := vRightOffs - wVScroll.
+            vRightOffs := 0 - scrolledViewMargin + margin "???".
+            vLeftOffs := vRightOffs - wVScroll.
 
-	    sRightOffs := sRightOffs - scrollBarSpacing - wVScroll + sBd.
+            sRightOffs := sRightOffs - scrollBarSpacing - wVScroll + sBd.
 
-	    hRightOffs := hRightOffs - wVScroll - scrollBarSpacing - sBd.
+            hRightOffs := hRightOffs - wVScroll - scrollBarSpacing - sBd.
 
-	    sRightOffs := sRightOffs - addMargin
-	] ifFalse:[
-	    "/ left/bottom
-	    vScrollBarLayout := ((0.0 @ 0.0) corner:(0.0@1.0)) asLayout.
+            sRightOffs := sRightOffs - addMargin
+        ] ifFalse:[
+            "/ left/bottom
+            vScrollBarLayout := ((0.0 @ 0.0) corner:(0.0@1.0)) asLayout.
 
-	    vLeftOffs := 0 - vBd + scrolledViewMargin + margin.
-	    vRightOffs := vLeftOffs + wVScroll + margin.
+            vLeftOffs := 0 - vBd + scrolledViewMargin + margin.
+            vRightOffs := vLeftOffs + wVScroll + margin.
 
-	    sLeftOffs := wVScroll + scrolledViewMargin + scrollBarSpacing + margin.
-	    sRightOffs := 0 - scrolledViewMargin - margin.
-	    hLeftOffs := hLeftOffs + wVScroll + vBd + scrollBarSpacing.
+            sLeftOffs := wVScroll + scrolledViewMargin + scrollBarSpacing + margin.
+            sRightOffs := 0 - scrolledViewMargin - margin.
+            hLeftOffs := hLeftOffs + wVScroll + vBd + scrollBarSpacing.
 
-	    sLeftOffs := sLeftOffs + addMargin
-	].
+            sLeftOffs := sLeftOffs + addMargin
+        ].
     ].
 
     hasH ifTrue:[
-	hBottomOffs := 0 - scrolledViewMargin - hBd + margin "???".
-	hTopOffs := hBottomOffs - hHScroll.
-	scrolledViewMargin == 0 ifTrue:[
-	    hTopOffs := hTopOffs + sBd + sBd
-	].
-	sBottomOffs := sBottomOffs - scrollBarSpacing - hHScroll.
-	(vScrollBar notNil and:[vScrollBarHidden not]) ifTrue:[
-	    vBottomOffs := vBottomOffs - scrollBarSpacing - hHScroll.
-	].
+        hBottomOffs := 0 - scrolledViewMargin - hBd + margin "???".
+        hTopOffs := hBottomOffs - hHScroll.
+        scrolledViewMargin == 0 ifTrue:[
+            hTopOffs := hTopOffs + sBd + sBd
+        ].
+        sBottomOffs := sBottomOffs - scrollBarSpacing - hHScroll.
+        (vScrollBar notNil and:[vScrollBarHidden not]) ifTrue:[
+            vBottomOffs := vBottomOffs - scrollBarSpacing - hHScroll.
+        ].
 
-	sBottomOffs := sBottomOffs - addMargin.
-	hRightOffs := hRightOffs - addMargin.
+        sBottomOffs := sBottomOffs - addMargin.
+        hRightOffs := hRightOffs - addMargin.
     ].
 
     (hScrollBar notNil
      and:[ hScrollBar borderWidth == 0 
      and:[sBd ~~ 0
      and:[scrollBarPosition == #right]]]) ifTrue:[
-	hRightOffs := hRightOffs + sBd + sBd.
+        hRightOffs := hRightOffs + sBd + sBd.
     ].
 
     scrolledView notNil ifTrue:[
-	scrolledViewLayout leftOffset:sLeftOffs.
-	scrolledViewLayout rightOffset:sRightOffs.
-	scrolledViewLayout topOffset:sTopOffs.
-	scrolledViewLayout bottomOffset:sBottomOffs.
+        scrolledViewLayout leftOffset:sLeftOffs.
+        scrolledViewLayout rightOffset:sRightOffs.
+        scrolledViewLayout topOffset:sTopOffs.
+        scrolledViewLayout bottomOffset:sBottomOffs.
 
-	configureScrolledView ifTrue:[
-	    ((hideVScrollBar or:[hideHScrollBar]) not
-	    and:[(hScrollBar isNil or:[hScrollBarHidden])
-	    and:[(vScrollBar isNil or:[vScrollBarHidden])]]) ifTrue:[
-		scrolledView level:0
-	    ] ifFalse:[
-		scrolledView level:DefaultScrolledViewLevel.
-	    ].
-	].
-	scrolledView layout:scrolledViewLayout.
+        configureScrolledView ifTrue:[
+            ((hideVScrollBar or:[hideHScrollBar]) not
+            and:[(hScrollBar isNil or:[hScrollBarHidden])
+            and:[(vScrollBar isNil or:[vScrollBarHidden])]]) ifTrue:[
+                scrolledView level:0
+            ] ifFalse:[
+                scrolledView level:DefaultScrolledViewLevel.
+            ].
+        ].
+        scrolledView layout:scrolledViewLayout.
     ].
     hasH ifTrue:[
-	hScrollBarLayout leftOffset:hLeftOffs.
-	hScrollBarLayout rightOffset:hRightOffs.
-	hScrollBarLayout topOffset:hTopOffs.
-	hScrollBarLayout bottomOffset:hBottomOffs.
+        hScrollBarLayout leftOffset:hLeftOffs.
+        hScrollBarLayout rightOffset:hRightOffs.
+        hScrollBarLayout topOffset:hTopOffs.
+        hScrollBarLayout bottomOffset:hBottomOffs.
 
-	hScrollBar level:DefaultScrollBarLevel.
-	hScrollBar layout:hScrollBarLayout
+        hScrollBar level:DefaultScrollBarLevel.
+        hScrollBar layout:hScrollBarLayout.
+
+"/        scrollBarPosition == #right ifTrue:[
+"/            "/ right/bottom
+"/            hScrollBar viewGravity:#SouthWest.
+"/        ] ifFalse:[
+"/            hScrollBar viewGravity:#NorthWest.
+"/        ]
     ].
     (vScrollBar notNil and:[vScrollBarHidden not]) ifTrue:[
-	vScrollBarLayout leftOffset:vLeftOffs.
-	vScrollBarLayout rightOffset:vRightOffs.
-	vScrollBarLayout topOffset:vTopOffs.
-	vScrollBarLayout bottomOffset:vBottomOffs.
+        vScrollBarLayout leftOffset:vLeftOffs.
+        vScrollBarLayout rightOffset:vRightOffs.
+        vScrollBarLayout topOffset:vTopOffs.
+        vScrollBarLayout bottomOffset:vBottomOffs.
 
-	vScrollBar level:DefaultScrollBarLevel.
-	vScrollBar layout:vScrollBarLayout
+        vScrollBar level:DefaultScrollBarLevel.
+        vScrollBar layout:vScrollBarLayout.
+
+"/        scrollBarPosition == #right ifTrue:[
+"/            "/ right/bottom
+"/            vScrollBar viewGravity:#NorthEast.
+"/        ] ifFalse:[
+"/            vScrollBar viewGravity:#NorthWest.
+"/        ]
     ].
 
     "Created: / 21.5.1998 / 00:48:35 / cg"
@@ -2050,5 +2064,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.94 1999-04-24 14:37:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.95 1999-05-03 21:33:39 cg Exp $'
 ! !
hg/stx-libwidg