Mercurial Mercurial > hg > stx-libtool / 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.
geometry fixes for win95 style
authorClaus Gittinger <cg@exept.de>
Thu, 20 Aug 1998 20:48:27 +0200
changeset 1846 6b66290db627
parent 1845 2d947fc85c15
child 1847 9dec36251b89
geometry fixes for win95 style
FBrowser.st file | annotate | diff | comparison | revisions
FileBrowser.st file | annotate | diff | comparison | revisions 
--- a/FBrowser.st	Thu Aug 20 19:52:34 1998 +0200
+++ b/FBrowser.st	Thu Aug 20 20:48:27 1998 +0200
@@ -2087,15 +2087,16 @@
     menuPanel receiver:self.
     menuPanel menu:(self pullDownMenu).
     mH := menuPanel preferredExtent y.
-    menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ mH).
+    menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)).
 
     labelFrame := View 
-                        origin:(0.0 @ (mH + 1))
-                        corner:(1.0 @ (font height * 2 + mH + 1))
+                        origin:(0.0 @ mH)
+                        corner:(1.0 @ (font height * 1.8 + mH) rounded)
                         in:self.
 
-    styleSheet name = #st80 ifTrue:[
-        labelFrame level:1
+    (styleSheet name = #st80 or:[styleSheet name == #win95]) ifTrue:[
+        labelFrame level:1.
+        labelFrame rightInset:-1.
     ].
 
     spacing := ViewSpacing.
@@ -2115,10 +2116,12 @@
     filterField := EditField in:labelFrame.
     filterField 
         origin:[((width // 4 * 3) + halfSpacing) @ (halfSpacing)]
-        corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing + halfSpacing) ).
-    filterField rightInset:halfSpacing.
+        corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing) ).
+    filterField rightInset:(ViewSpacing - halfSpacing).
     filterField model:filterModel.
 
+    labelFrame corner:(1.0 @ (mH + ViewSpacing + filterField height + halfSpacing)).
+
     self initializeFilterPattern.
     filterModel onChangeSend:#filterPatternChanged to:self.
 "/    filterField leaveAction:[:key | fileListView scrollToTop. self updateCurrentDirectory].
@@ -2252,7 +2255,7 @@
 
     "Modified: / 6.9.1995 / 20:26:06 / claus"
     "Modified: / 16.9.1997 / 14:52:46 / stefan"
-    "Modified: / 14.8.1998 / 19:20:33 / cg"
+    "Modified: / 20.8.1998 / 20:45:59 / cg"
 !
 
 initializeCommandViewIn:frame
@@ -5119,5 +5122,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.246 1998-08-20 17:52:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Attic/FBrowser.st,v 1.247 1998-08-20 18:48:27 cg Exp $'
 ! !
--- a/FileBrowser.st	Thu Aug 20 19:52:34 1998 +0200
+++ b/FileBrowser.st	Thu Aug 20 20:48:27 1998 +0200
@@ -2087,15 +2087,16 @@
     menuPanel receiver:self.
     menuPanel menu:(self pullDownMenu).
     mH := menuPanel preferredExtent y.
-    menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ mH).
+    menuPanel origin:(0.0 @ 0.0) corner:(1.0 @ (mH)).
 
     labelFrame := View 
-                        origin:(0.0 @ (mH + 1))
-                        corner:(1.0 @ (font height * 2 + mH + 1))
+                        origin:(0.0 @ mH)
+                        corner:(1.0 @ (font height * 1.8 + mH) rounded)
                         in:self.
 
-    styleSheet name = #st80 ifTrue:[
-        labelFrame level:1
+    (styleSheet name = #st80 or:[styleSheet name == #win95]) ifTrue:[
+        labelFrame level:1.
+        labelFrame rightInset:-1.
     ].
 
     spacing := ViewSpacing.
@@ -2115,10 +2116,12 @@
     filterField := EditField in:labelFrame.
     filterField 
         origin:[((width // 4 * 3) + halfSpacing) @ (halfSpacing)]
-        corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing + halfSpacing) ).
-    filterField rightInset:halfSpacing.
+        corner:(1.0 @ (filterField heightIncludingBorder + halfSpacing) ).
+    filterField rightInset:(ViewSpacing - halfSpacing).
     filterField model:filterModel.
 
+    labelFrame corner:(1.0 @ (mH + ViewSpacing + filterField height + halfSpacing)).
+
     self initializeFilterPattern.
     filterModel onChangeSend:#filterPatternChanged to:self.
 "/    filterField leaveAction:[:key | fileListView scrollToTop. self updateCurrentDirectory].
@@ -2252,7 +2255,7 @@
 
     "Modified: / 6.9.1995 / 20:26:06 / claus"
     "Modified: / 16.9.1997 / 14:52:46 / stefan"
-    "Modified: / 14.8.1998 / 19:20:33 / cg"
+    "Modified: / 20.8.1998 / 20:45:59 / cg"
 !
 
 initializeCommandViewIn:frame
@@ -5119,5 +5122,5 @@
 !FileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.246 1998-08-20 17:52:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowser.st,v 1.247 1998-08-20 18:48:27 cg Exp $'
 ! !
hg/stx-libtool