hg/stx-libview: comparison StandardSystemView.st

equal deleted inserted replaced

-:cad293885151
+:9036d75c2799
 maxExtent y isNil ifTrue:[
 maxExtent := maxExtent x @ 99999.
 ].
 (id := self drawableId) notNil ifTrue:[
-self graphicsDevice setWindowMinExtent:nil maxExtent:max in:id
+device setWindowMinExtent:nil maxExtent:max in:id
 ].
 "/ if my current extent is larger than the new
 "/ maxExtent, adjust.
 |id|
 minExtent ~= min ifTrue:[
 minExtent := min.
 (id := self drawableId) notNil ifTrue:[
-self graphicsDevice setWindowMinExtent:min maxExtent:nil in:id
+device setWindowMinExtent:min maxExtent:nil in:id
 ].
 "/ if my current extent is smaller than the new
 "/ minExtent, adjust.
 icon := aFormOrImage.
 iconValue := icon value.
 iconValue notNil ifTrue:[
 self drawableId notNil ifTrue:[
-i := self graphicsDevice convertedIcon:iconValue.
+i := device convertedIcon:iconValue.
 (i notNil and:[i id notNil]) ifTrue:[
 (m := iconValue mask) notNil ifTrue:[
-m := self graphicsDevice convertedIconMask:m.
+m := device convertedIconMask:m.
 ].
-self graphicsDevice setWindowIcon:i mask:m in:self drawableId
+device setWindowIcon:i mask:m in:self drawableId
 ]
 ]
 ]
 "Modified: / 30-10-2007 / 16:39:15 / cg"
 |newLabel|
 (newLabel := aString string) ~= iconLabel ifTrue:[
 iconLabel := newLabel.
 self drawableId notNil ifTrue:[
-self graphicsDevice setIconName:newLabel in:self drawableId.
+device setIconName:newLabel in:self drawableId.
 "
 unbuffered - to make it visible right NOW
 "
 self flush.
 ]
 |mask|
 "/ only images possibly have iconMasks
 icon notNil ifTrue:[
 (mask := icon value mask) notNil ifTrue:[
-^ self graphicsDevice convertedIconMask:mask
+^ device convertedIconMask:mask
 ]
 ].
 ^ nil
 This may not be supported on all display types"
 iconView := aView.
 self drawableId notNil ifTrue:[
 aView create.
-self graphicsDevice setWindowIconWindow:aView in:self drawableId.
+device setWindowIconWindow:aView in:self drawableId.
 aView setRealized:true.
 ]
 "Modified: 4.4.1997 / 16:21:37 / cg"
 !
 "/ there are situations where this does not happen;
 "/ I am not sure if that is a WM bug or an ST/X bug, but sometimes (with popups),
 "/ I only get a focus in. Could be a race, when the loosing view is already destroyed,
 "/ at the time the focus event arrives.
 "/ Anyway: it should not matter to take it again...
-WindowGroup takeFocusFromDevice:self graphicsDevice.
+WindowGroup takeFocusFromDevice:device.
 windowGroup isInModalLoop ifTrue:[
 windowGroup allTopViewsDo:[:t |
 t ~~ self ifTrue:[
 t focusIn.
 initialize
 super initialize.
 "/ self setBorderWidth:2.         "- notice: many window managers ignore this"
-self graphicsDevice isWindowsPlatform ifTrue:[
+device isWindowsPlatform ifTrue:[
 minExtent := 0 @ 0.
 ] ifFalse:[
 minExtent := 10 @ 10.
 ].
 "Modified: / 27-10-2012 / 12:16:39 / cg"
 !
 mapped
 super mapped.
-self graphicsDevice isWindowsPlatform ifTrue:[
+device isWindowsPlatform ifTrue:[
 "don't do this in X11 - switching between
 virtual desktops would change the window stacking all the time"
 self setForegroundWindow.
 self activate.
 ].
 when we come up on a smaller display,
 make certain, that the receiver is visible"
 |dX dY limitRight limitBottom graphicsDevice|
-graphicsDevice := self graphicsDevice.
+graphicsDevice := device.
 dX := (graphicsDevice horizontalPixelPerMillimeter * 20) rounded.
 dY := (graphicsDevice verticalPixelPerMillimeter * 20) rounded.
 limitRight := graphicsDevice usableWidth - dX.
 limitBottom := graphicsDevice usableHeight - dY.
 "physically create the view & subviews"
 self recreate.
 "if I was iconified (not realized), remap iconified"
-self graphicsDevice
+device
 mapView:self id:self drawableId iconified:(realized "shown" not)
 atX:left y:top width:width height:height
 minExtent:minExtent maxExtent:maxExtent.
 "and restart the window-group process"
 convertedIcon
 "make certain, that the icon is compatible with my device;
 this means converting it to a format (typically: monochrome) which
 the device supports. Return a compatible version of the icon."
-^ self graphicsDevice convertedIcon:icon
+^ device convertedIcon:icon
 "Modified: / 30-10-2007 / 16:39:55 / cg"
 !
 convertedIcon:iconArg
 "make certain, that the image argument is compatible with my device;
 this means converting it to a format (typically: monochrome) which
 the device supports. Return a compatible version of the icon."
-^ self graphicsDevice convertedIcon:iconArg
+^ device convertedIcon:iconArg
 "Modified: / 30-10-2007 / 16:37:31 / cg"
 !
 convertedIconMask:aMask
 "return a version of the argument which can be used as an iconMask
 on my device. Typically, this means conversion to a monochrome
 mask - future versions may add alpha channel masks, if the device supports
 them ..."
-^ self graphicsDevice convertedIconMask:aMask
+^ device convertedIconMask:aMask
 "Modified: / 30-10-2007 / 16:38:58 / cg"
 !
 setWindowGroupFromApplication
 shown ifTrue:[
 self unmap.
 "if it was iconified, try to remap iconified"
-self graphicsDevice
+device
 mapView:self id:self drawableId iconified:true
 atX:left y:top width:width height:height
 minExtent:minExtent maxExtent:maxExtent.
 shown ifTrue:[
 super create.
 iconView notNil ifTrue:[
 iconView create.
-self graphicsDevice setWindowIconWindow:iconView in:self drawableId.
+device setWindowIconWindow:iconView in:self drawableId.
 iconView setRealized:true.
 ].
 iconLabel notNil ifTrue:[
-self graphicsDevice setIconName:iconLabel string in:self drawableId
+device setIconName:iconLabel string in:self drawableId
 ]
 "Modified: 10.6.1996 / 20:14:50 / cg"
 !
 shown ifFalse:[
 self unmap.
 "if it was iconified, try to remap non-iconified"
-self graphicsDevice
+device
 mapView:self id:self drawableId iconified:false
 atX:left y:top width:width height:height
 minExtent:minExtent maxExtent:maxExtent.
 ].
 !
 physicalCreate
 "common code for create & recreate"
-|dev lbl iconValue icn icnMask windowClassNameString org devBounds windowNameString|
+|dev currentUserPrefs lbl iconValue icn icnMask windowClassNameString org devBounds windowNameString|
-dev := self device.
+dev := device.
+currentUserPrefs := UserPreferences current.
-UserPreferences current forceWindowsIntoMonitorBounds ifTrue:[
+currentUserPrefs forceWindowsIntoMonitorBounds ifTrue:[
 "/ MULTI SCREEN support
 devBounds := dev monitorBoundsAt:( left @ top ).
 "/ adjust origin, if too large
 left + width > devBounds right ifTrue:[
 left := devBounds right - width.
 "/               conformant should not hurt as St/X don't depend on X resources anyway :-)
 "/               See:
 "/
 "/               http://tronche.com/gui/x/icccm/sec-4.html
-(UserPreferences current icccm20Compliant == true) ifTrue:[
+(currentUserPrefs icccm20Compliant == true) ifTrue:[
 "/ICCCM 2.0 compliant name & class. See ICCCM 2.0 section 4.1.2.5.
 | commandName lastSepIndex |
 commandName := Smalltalk commandName.
 super recreate.
 iconView notNil ifTrue:[
 iconView recreate.
-self graphicsDevice setWindowIconWindow:iconView in:self drawableId.
+device setWindowIconWindow:iconView in:self drawableId.
 iconView setRealized:true.
 ] ifFalse:[
 icon notNil ifTrue:[
-self icon:(self graphicsDevice convertedIcon:icon).
+self icon:(device convertedIcon:icon).
 ].
 ].
 iconLabel notNil ifTrue:[
-self graphicsDevice setIconName:iconLabel in:self drawableId
+device setIconName:iconLabel in:self drawableId
 ]
 "Modified: / 30-10-2007 / 16:39:42 / cg"
 ! !

changeset 7263	9036d75c2799
parent 7140	9c2e17ff88f8
child 7286	c3b4c3c664d4
child 7398	6d085e759693