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.
commentary
authorClaus Gittinger <cg@exept.de>
Tue, 23 Apr 1996 00:20:42 +0200
changeset 572 121735c2aff6
parent 571 ddc5d56bd636
child 573 3335fee474b5
commentary
EnterBox.st file | annotate | diff | comparison | revisions
FontPanel.st file | annotate | diff | comparison | revisions
FramedBox.st file | annotate | diff | comparison | revisions
HVScrView.st file | annotate | diff | comparison | revisions
HVScrollableView.st file | annotate | diff | comparison | revisions
MiniScr.st file | annotate | diff | comparison | revisions
MiniScroller.st file | annotate | diff | comparison | revisions
PullDMenu.st file | annotate | diff | comparison | revisions
PullDownMenu.st file | annotate | diff | comparison | revisions
ScrView.st file | annotate | diff | comparison | revisions
ScrollableView.st file | annotate | diff | comparison | revisions
Scroller.st file | annotate | diff | comparison | revisions
YesNoBox.st file | annotate | diff | comparison | revisions 
--- a/EnterBox.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/EnterBox.st	Tue Apr 23 00:20:42 1996 +0200
@@ -433,6 +433,8 @@
 !EnterBox methodsFor:'queries'!
 
 preferredExtent 
+    "compute the boxes preferredExtent from the components' sizes"
+
     |wWanted hWanted wPanel vs2 min 
      labelPref enterPref panelPref|
 
@@ -442,21 +444,23 @@
     wWanted := (labelPref x max:enterPref x).
     wPanel := panelPref x.
     wPanel > wWanted ifTrue:[
-	wWanted := wPanel
+        wWanted := wPanel
     ].
 
     hWanted := labelPref y + enterPref y +
-	       (ViewSpacing * 6) + panelPref y + ViewSpacing.
+               (ViewSpacing * 6) + panelPref y + ViewSpacing.
 
     min := self class minExtent.
     wWanted <  min x ifTrue:[
-	wWanted :=  min x
+        wWanted :=  min x
     ].
     hWanted <  min y ifTrue:[
-	hWanted :=  min y
+        hWanted :=  min y
     ].
     vs2 := ViewSpacing * 2.
-    ^ (wWanted + vs2) @ (hWanted + vs2) 
+    ^ (wWanted + vs2) @ (hWanted + vs2)
+
+    "Modified: 23.4.1996 / 00:14:28 / cg"
 ! !
 
 !EnterBox methodsFor:'startup'!
@@ -567,5 +571,5 @@
 !EnterBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.37 1996-04-22 21:42:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EnterBox.st,v 1.38 1996-04-22 22:20:33 cg Exp $'
 ! !
--- a/FontPanel.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/FontPanel.st	Tue Apr 23 00:20:42 1996 +0200
@@ -452,7 +452,11 @@
 !FontPanel methodsFor:'queries'!
 
 preferredExtent
+    "compute the boxes preferredExtent"
+
     ^ 400@350
+
+    "Modified: 23.4.1996 / 00:14:40 / cg"
 ! !
 
 !FontPanel methodsFor:'user interaction'!
@@ -552,5 +556,5 @@
 !FontPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.30 1996-04-22 21:42:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FontPanel.st,v 1.31 1996-04-22 22:20:22 cg Exp $'
 ! !
--- a/FramedBox.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/FramedBox.st	Tue Apr 23 00:20:42 1996 +0200
@@ -560,7 +560,8 @@
 !FramedBox methodsFor:'queries'!
 
 preferredExtent
-    "redefined to add space for the frame to the default extent" 
+    "compute the boxes preferredExtent from the components' sizes.
+     Redefined to add space for the frame to the default extent" 
 
     |m2 sep|
 
@@ -568,9 +569,11 @@
     m2 := sep + sep.
 
     showFrame ifFalse:[
-	^ super preferredExtent + (0 @ m2)
+        ^ super preferredExtent + (0 @ m2)
     ].
     ^ super preferredExtent+(m2 @ m2)
+
+    "Modified: 23.4.1996 / 00:15:04 / cg"
 !
 
 viewRectangle
@@ -614,5 +617,5 @@
 !FramedBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.19 1996-01-10 13:54:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/FramedBox.st,v 1.20 1996-04-22 22:20:10 cg Exp $'
 ! !
--- a/HVScrView.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/HVScrView.st	Tue Apr 23 00:20:42 1996 +0200
@@ -11,10 +11,10 @@
 "
 
 ScrollableView subclass:#HVScrollableView
-	 instanceVariableNames:'hScrollBar'
-	 classVariableNames:''
-	 poolDictionaries:''
-	 category:'Views-Basic'
+	instanceVariableNames:'hScrollBar'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Views-Basic'
 !
 
 !HVScrollableView class methodsFor:'documentation'!
@@ -264,20 +264,24 @@
 !HVScrollableView methodsFor:'queries'!
 
 preferredExtent
+    "return the components preferredExtent."
+
     |pref m2|
 
     scrolledView notNil ifTrue:[ 
-	m2 := innerMargin * 2.
-	pref := scrolledView preferredExtent.
-	^ (pref x + scrollBar width + m2) 
-	  @ 
-	  (pref y + hScrollBar height + m2).
+        m2 := innerMargin * 2.
+        pref := scrolledView preferredExtent.
+        ^ (pref x + scrollBar width + m2) 
+          @ 
+          (pref y + hScrollBar height + m2).
     ].
     ^ super preferredExtent.
+
+    "Modified: 23.4.1996 / 00:15:25 / cg"
 ! !
 
 !HVScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/HVScrView.st,v 1.14 1995-11-27 22:28:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/HVScrView.st,v 1.15 1996-04-22 22:20:01 cg Exp $'
 ! !
--- a/HVScrollableView.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/HVScrollableView.st	Tue Apr 23 00:20:42 1996 +0200
@@ -11,10 +11,10 @@
 "
 
 ScrollableView subclass:#HVScrollableView
-	 instanceVariableNames:'hScrollBar'
-	 classVariableNames:''
-	 poolDictionaries:''
-	 category:'Views-Basic'
+	instanceVariableNames:'hScrollBar'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Views-Basic'
 !
 
 !HVScrollableView class methodsFor:'documentation'!
@@ -264,20 +264,24 @@
 !HVScrollableView methodsFor:'queries'!
 
 preferredExtent
+    "return the components preferredExtent."
+
     |pref m2|
 
     scrolledView notNil ifTrue:[ 
-	m2 := innerMargin * 2.
-	pref := scrolledView preferredExtent.
-	^ (pref x + scrollBar width + m2) 
-	  @ 
-	  (pref y + hScrollBar height + m2).
+        m2 := innerMargin * 2.
+        pref := scrolledView preferredExtent.
+        ^ (pref x + scrollBar width + m2) 
+          @ 
+          (pref y + hScrollBar height + m2).
     ].
     ^ super preferredExtent.
+
+    "Modified: 23.4.1996 / 00:15:25 / cg"
 ! !
 
 !HVScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/HVScrollableView.st,v 1.14 1995-11-27 22:28:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/HVScrollableView.st,v 1.15 1996-04-22 22:20:01 cg Exp $'
 ! !
--- a/MiniScr.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/MiniScr.st	Tue Apr 23 00:20:42 1996 +0200
@@ -76,7 +76,7 @@
 !MiniScroller methodsFor:'queries'!
 
 preferredExtent
-    "make my width very small"
+    "return my preferredExtent - make my width very small"
 
     |defExt w h mm|
 
@@ -91,11 +91,11 @@
     ].
     ^ w @ h.
 
-    "Modified: 17.4.1996 / 14:02:43 / cg"
+    "Modified: 23.4.1996 / 00:16:42 / cg"
 ! !
 
 !MiniScroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/MiniScr.st,v 1.9 1996-04-19 16:49:07 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/MiniScr.st,v 1.10 1996-04-22 22:19:01 cg Exp $'
 ! !
--- a/MiniScroller.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/MiniScroller.st	Tue Apr 23 00:20:42 1996 +0200
@@ -76,7 +76,7 @@
 !MiniScroller methodsFor:'queries'!
 
 preferredExtent
-    "make my width very small"
+    "return my preferredExtent - make my width very small"
 
     |defExt w h mm|
 
@@ -91,11 +91,11 @@
     ].
     ^ w @ h.
 
-    "Modified: 17.4.1996 / 14:02:43 / cg"
+    "Modified: 23.4.1996 / 00:16:42 / cg"
 ! !
 
 !MiniScroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/MiniScroller.st,v 1.9 1996-04-19 16:49:07 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/MiniScroller.st,v 1.10 1996-04-22 22:19:01 cg Exp $'
 ! !
--- a/PullDMenu.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/PullDMenu.st	Tue Apr 23 00:20:42 1996 +0200
@@ -1442,10 +1442,14 @@
 !PullDownMenu methodsFor:'queries'!
 
 preferredExtent
+    "return my preferredExtent from the title-item widths & font height"
+
     |w|
 
     w := self titleLenUpTo:(titles size + 1).
     ^ w @ (font height + (font descent * 2) "+ topMargin" + (margin*2)).
+
+    "Modified: 23.4.1996 / 00:17:24 / cg"
 ! !
 
 !PullDownMenu methodsFor:'submenu notifications'!
@@ -1482,5 +1486,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.46 1996-04-17 20:20:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/PullDMenu.st,v 1.47 1996-04-22 22:19:32 cg Exp $'
 ! !
--- a/PullDownMenu.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/PullDownMenu.st	Tue Apr 23 00:20:42 1996 +0200
@@ -1442,10 +1442,14 @@
 !PullDownMenu methodsFor:'queries'!
 
 preferredExtent
+    "return my preferredExtent from the title-item widths & font height"
+
     |w|
 
     w := self titleLenUpTo:(titles size + 1).
     ^ w @ (font height + (font descent * 2) "+ topMargin" + (margin*2)).
+
+    "Modified: 23.4.1996 / 00:17:24 / cg"
 ! !
 
 !PullDownMenu methodsFor:'submenu notifications'!
@@ -1482,5 +1486,5 @@
 !PullDownMenu class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.46 1996-04-17 20:20:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.47 1996-04-22 22:19:32 cg Exp $'
 ! !
--- a/ScrView.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/ScrView.st	Tue Apr 23 00:20:42 1996 +0200
@@ -864,12 +864,17 @@
 !ScrollableView methodsFor:'queries'!
 
 preferredExtent
+    "return my preferredExtent from the scrolledViews prefExtent
+     plus the size of the scrollBar"
+
     scrolledView notNil ifTrue:[ 
        | pref |
        pref := scrolledView preferredExtent.
        ^ (pref x + scrollBar width + (innerMargin * 2)) @ pref y.
     ].
     ^ super preferredExtent.
+
+    "Modified: 23.4.1996 / 00:17:53 / cg"
 ! !
 
 !ScrollableView methodsFor:'slave-view messages'!
@@ -939,5 +944,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.28 1996-04-20 13:52:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.29 1996-04-22 22:19:16 cg Exp $'
 ! !
--- a/ScrollableView.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/ScrollableView.st	Tue Apr 23 00:20:42 1996 +0200
@@ -864,12 +864,17 @@
 !ScrollableView methodsFor:'queries'!
 
 preferredExtent
+    "return my preferredExtent from the scrolledViews prefExtent
+     plus the size of the scrollBar"
+
     scrolledView notNil ifTrue:[ 
        | pref |
        pref := scrolledView preferredExtent.
        ^ (pref x + scrollBar width + (innerMargin * 2)) @ pref y.
     ].
     ^ super preferredExtent.
+
+    "Modified: 23.4.1996 / 00:17:53 / cg"
 ! !
 
 !ScrollableView methodsFor:'slave-view messages'!
@@ -939,5 +944,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.28 1996-04-20 13:52:21 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.29 1996-04-22 22:19:16 cg Exp $'
 ! !
--- a/Scroller.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/Scroller.st	Tue Apr 23 00:20:42 1996 +0200
@@ -1697,6 +1697,8 @@
 !Scroller methodsFor:'queries'!
 
 preferredExtent
+    "return my preferredExtent"
+
     |defExt w h|
 
     defExt := self class defaultExtent.
@@ -1711,11 +1713,11 @@
 
     ^ w @ h.
 
-    "Modified: 17.4.1996 / 14:00:58 / cg"
+    "Modified: 23.4.1996 / 00:18:04 / cg"
 ! !
 
 !Scroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.46 1996-04-22 21:41:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.47 1996-04-22 22:18:39 cg Exp $'
 ! !
--- a/YesNoBox.st	Mon Apr 22 23:42:27 1996 +0200
+++ b/YesNoBox.st	Tue Apr 23 00:20:42 1996 +0200
@@ -140,7 +140,11 @@
 !YesNoBox class methodsFor:'instance creation'!
 
 title:t yesText:yesString noText:noString
+    "return a new YesNoBox with title, and buttonLabels yesString/noString"
+
     ^ (self new) title:t yesText:yesString noText:noString
+
+    "Modified: 23.4.1996 / 00:12:48 / cg"
 ! !
 
 !YesNoBox class methodsFor:'icon bitmap'!
@@ -274,10 +278,6 @@
 
 !YesNoBox methodsFor:'initialization'!
 
-focusSequence
-    ^ Array with:abortButton with:okButton 
-!
-
 initialize
     super initialize.
 
@@ -297,7 +297,17 @@
 
 !YesNoBox methodsFor:'queries'!
 
+focusSequence
+    "return the focusSequence through the box"
+
+    ^ Array with:abortButton with:okButton
+
+    "Modified: 23.4.1996 / 00:13:12 / cg"
+!
+
 preferredExtent 
+    "compute the boxes preferredExtent from the components' sizes"
+
     |w h max mm|
 
     mm := ViewSpacing.
@@ -317,7 +327,7 @@
 
     ^ (w @ h).
 
-    "Modified: 21.2.1996 / 00:58:04 / cg"
+    "Modified: 23.4.1996 / 00:13:41 / cg"
 ! !
 
 !YesNoBox methodsFor:'startup'!
@@ -371,5 +381,5 @@
 !YesNoBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/YesNoBox.st,v 1.25 1996-03-01 13:05:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/YesNoBox.st,v 1.26 1996-04-22 22:20:42 cg Exp $'
 ! !
hg/stx-libwidg