Mercurial Mercurial > hg > stx-libview / 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, 10 Jun 1996 22:18:43 +0200
changeset 827 3dca7f976df0
parent 826 307701c3c760
child 828 e5cc03d2c673
checkin from browser
DevWorkst.st file | annotate | diff | comparison | revisions
DeviceWorkstation.st file | annotate | diff | comparison | revisions
StandardSystemView.st file | annotate | diff | comparison | revisions
StdSysV.st file | annotate | diff | comparison | revisions 
--- a/DevWorkst.st	Mon Jun 10 21:58:11 1996 +0200
+++ b/DevWorkst.st	Mon Jun 10 22:18:43 1996 +0200
@@ -1124,7 +1124,7 @@
     "Get the preferrered icon size. These are typically set by the window manager.
      We return nil here (as if there are no special size preferences)."
 
-    |sizes spec sz|
+    |sizes spec sz sz2|
 
     preferredIconSize isNil ifTrue:[
         sizes := self iconSizes.
@@ -1134,11 +1134,17 @@
             "/ we prefer square icons ...
 
             sz := (spec at:#maxWidth) min: (spec at:#maxHeight).
+            sz > 64 ifTrue:[
+                sz2 := (spec at:#minWidth) max: (spec at:#minHeight).
+                sz2 <= 48 ifTrue:[
+                    sz := 48
+                ]
+            ].
             preferredIconSize := sz @ sz
         ].
-	preferredIconSize isNil ifTrue:[
-	    preferredIconSize := 48@48
-	].
+        preferredIconSize isNil ifTrue:[
+            preferredIconSize := 48@48
+        ].
     ].
 
     ^ preferredIconSize
@@ -1146,9 +1152,10 @@
     "
      Display preferredIconSize
      Display preferredIconSize:32@32
+     Display preferredIconSize:nil
     "
 
-    "Modified: 10.6.1996 / 21:03:29 / cg"
+    "Modified: 10.6.1996 / 22:10:58 / cg"
 !
 
 preferredIconSize:anExtentPoint
@@ -4244,6 +4251,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.104 1996-06-10 19:58:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/DevWorkst.st,v 1.105 1996-06-10 20:18:43 cg Exp $'
 ! !
 DeviceWorkstation initialize!
--- a/DeviceWorkstation.st	Mon Jun 10 21:58:11 1996 +0200
+++ b/DeviceWorkstation.st	Mon Jun 10 22:18:43 1996 +0200
@@ -1124,7 +1124,7 @@
     "Get the preferrered icon size. These are typically set by the window manager.
      We return nil here (as if there are no special size preferences)."
 
-    |sizes spec sz|
+    |sizes spec sz sz2|
 
     preferredIconSize isNil ifTrue:[
         sizes := self iconSizes.
@@ -1134,11 +1134,17 @@
             "/ we prefer square icons ...
 
             sz := (spec at:#maxWidth) min: (spec at:#maxHeight).
+            sz > 64 ifTrue:[
+                sz2 := (spec at:#minWidth) max: (spec at:#minHeight).
+                sz2 <= 48 ifTrue:[
+                    sz := 48
+                ]
+            ].
             preferredIconSize := sz @ sz
         ].
-	preferredIconSize isNil ifTrue:[
-	    preferredIconSize := 48@48
-	].
+        preferredIconSize isNil ifTrue:[
+            preferredIconSize := 48@48
+        ].
     ].
 
     ^ preferredIconSize
@@ -1146,9 +1152,10 @@
     "
      Display preferredIconSize
      Display preferredIconSize:32@32
+     Display preferredIconSize:nil
     "
 
-    "Modified: 10.6.1996 / 21:03:29 / cg"
+    "Modified: 10.6.1996 / 22:10:58 / cg"
 !
 
 preferredIconSize:anExtentPoint
@@ -4244,6 +4251,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.104 1996-06-10 19:58:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.105 1996-06-10 20:18:43 cg Exp $'
 ! !
 DeviceWorkstation initialize!
--- a/StandardSystemView.st	Mon Jun 10 21:58:11 1996 +0200
+++ b/StandardSystemView.st	Mon Jun 10 22:18:43 1996 +0200
@@ -957,7 +957,7 @@
 
     d := icon depth.
     device supportsDeepIcons ifFalse:[
-        d ~~ 1 ifTrue:[
+        (d ~~ 1 or:[icon isImage]) ifTrue:[
             "
              dither to monochrome
             "
@@ -1001,7 +1001,7 @@
     ^ deviceIcon
 
     "Created: 10.6.1996 / 19:41:31 / cg"
-    "Modified: 10.6.1996 / 21:36:28 / cg"
+    "Modified: 10.6.1996 / 22:17:34 / cg"
 !
 
 setWindowGroupFromApplication
@@ -1209,5 +1209,5 @@
 !StandardSystemView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/StandardSystemView.st,v 1.55 1996-06-10 19:37:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/StandardSystemView.st,v 1.56 1996-06-10 20:17:54 cg Exp $'
 ! !
--- a/StdSysV.st	Mon Jun 10 21:58:11 1996 +0200
+++ b/StdSysV.st	Mon Jun 10 22:18:43 1996 +0200
@@ -957,7 +957,7 @@
 
     d := icon depth.
     device supportsDeepIcons ifFalse:[
-        d ~~ 1 ifTrue:[
+        (d ~~ 1 or:[icon isImage]) ifTrue:[
             "
              dither to monochrome
             "
@@ -1001,7 +1001,7 @@
     ^ deviceIcon
 
     "Created: 10.6.1996 / 19:41:31 / cg"
-    "Modified: 10.6.1996 / 21:36:28 / cg"
+    "Modified: 10.6.1996 / 22:17:34 / cg"
 !
 
 setWindowGroupFromApplication
@@ -1209,5 +1209,5 @@
 !StandardSystemView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/Attic/StdSysV.st,v 1.55 1996-06-10 19:37:40 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/Attic/StdSysV.st,v 1.56 1996-06-10 20:17:54 cg Exp $'
 ! !
hg/stx-libview