hg/stx-libwidg: comparison MenuView.st

equal deleted inserted replaced

-:0eef67afe3e7
+:3598f62e2108
 CAVEAT: with the addition of Text objects,
 this method is going to be obsoleted by a textStyle
 method, which allows specific control over
 normalFont/boldFont/italicFont parameters."
-super font:(aFont onDevice:device).
+super font:aFont.
 preferredExtent := nil.
 shown ifTrue:[
 self resize
 ] ifFalse:[
 needResize := true
 ].
 subMenus at:i put:aPopUpMenu.
 aPopUpMenu notNil ifTrue:[
 aPopUpMenu isBlock ifFalse:[
-aPopUpMenu device:device.
+aPopUpMenu device:self graphicsDevice.
 (receiver notNil and:[aPopUpMenu receiver isNil]) ifTrue:[
 aPopUpMenu receiver:receiver
 ]
 ].
 ].
 |s x l isSubMenuEntry|
 "/ this is somewhat complicated: we have the symbolic key at hand,
 "/ but want to show the untranslated (inverse keyBoardMapped) key & modifier
 "/
-s := device shortKeyStringFor:aSymbolicKey.
+s := self graphicsDevice shortKeyStringFor:aSymbolicKey.
 s isNil ifTrue:[^ self].
 l := self visibleLineToAbsoluteLine:visLineNr.
 disabledEtchedFgColor notNil ifTrue:[
 isSubMenuEntry ifFalse:[
 "/ this aligns them along their left
 x := width - textStartLeft - self shortKeyInset.
 ] ifTrue:[
 "/ this aligns them at the right
-x := width - leftMargin - (font widthOf:s).
+x := width - leftMargin - (gc font widthOf:s).
 x := x - 16    "/ should query for the arrow size here ...
 ].
 hilightStyle == #openwin ifTrue:[
 x := x - 2            "/ inset of rounded rectangle
 markIndex ~~ 1 ifTrue:[
 super drawVisibleLine:visLineNr from:1 to:(markIndex-1) with:fg and:bg.
 ].
 (markType == $c) ifTrue:[
-w := font widthOf:'V'.
+w := gc font widthOf:'V'.
 check ifTrue:[
 form := checkOnImage.
 ] ifFalse:[
 form := checkOffImage.
 ]
 ] ifFalse:[
 (markType == $b) ifTrue:[
-w := font maxWidth. "/ font widthOf:'   '.
+w := gc font maxWidth. "/ font widthOf:'   '.
 ] ifFalse:[
 (markType == $t) ifTrue:[
 check ifTrue:[form := Cursor thumbsUp sourceForm]
 ifFalse:[form := Cursor thumbsDown sourceForm]
 ]
 ].
 self drawLine:(line copyFrom:markIndex+2) fromX:x+w inVisible:visLineNr with:fg and:bg.
 self paint:(check ifTrue:[checkColor == bg ifTrue:[fg] ifFalse:[checkColor]] ifFalse:[fg]).
-h := font ascent.
+h := gc font ascent.
-y := y + (font height - h // 2).
+y := y + (gc font height - h // 2).
 yB := y + h - 1.
 form notNil ifTrue:[
 self displayForm:form x:x y:y
 ] ifFalse:[
 fetchDeviceResources
 "fetch device colors, to avoid reallocation at redraw time"
 super fetchDeviceResources.
-checkColor notNil ifTrue:[checkColor := checkColor onDevice:device].
+checkColor notNil ifTrue:[checkColor := checkColor onDevice:self graphicsDevice].
-disabledFgColor notNil ifTrue:[disabledFgColor := disabledFgColor onDevice:device].
+disabledFgColor notNil ifTrue:[disabledFgColor := disabledFgColor onDevice:self graphicsDevice].
 hilightFgColorNoFocus := hilightFgColor.
 hilightBgColorNoFocus := hilightBgColor.
 "Created: 14.1.1997 / 00:08:55 / cg"
 !
 initStyle
 "setup viewStyle specifics"
-|style|
+|style graphicsDevice|
 super initStyle.
+graphicsDevice := self graphicsDevice.
 DefaultCheckColor notNil ifTrue:[
 checkColor := DefaultCheckColor
 ] ifFalse:[
 checkColor := fgColor.
 ].
 disabledFgColor := DefaultDisabledForegroundColor.
 disabledEtchedFgColor := DefaultDisabledEtchedForegroundColor.
 DefaultForegroundColor notNil ifTrue:[
-fgColor := DefaultForegroundColor onDevice:device
+fgColor := DefaultForegroundColor onDevice:graphicsDevice
 ].
 DefaultBackgroundColor notNil ifTrue:[
-bgColor := DefaultBackgroundColor onDevice:device
+bgColor := DefaultBackgroundColor onDevice:graphicsDevice
 ].
 DefaultShadowColor notNil ifTrue:[
-shadowColor := DefaultShadowColor onDevice:device
+shadowColor := DefaultShadowColor onDevice:graphicsDevice
 ].
 DefaultLightColor notNil ifTrue:[
-lightColor := DefaultLightColor onDevice:device
+lightColor := DefaultLightColor onDevice:graphicsDevice
 ].
 DefaultHilightLevel notNil ifTrue:[
 hilightLevel := DefaultHilightLevel
 ] ifFalse:[
 styleSheet is3D ifTrue:[
 "some 3D style menu - set hilight defaults to same"
 DefaultHilightForegroundColor notNil ifTrue:[
-hilightFgColor := DefaultHilightForegroundColor onDevice:device
+hilightFgColor := DefaultHilightForegroundColor onDevice:graphicsDevice
 ] ifFalse:[
 hilightFgColor := fgColor.
 ].
 DefaultHilightBackgroundColor notNil ifTrue:[
-hilightBgColor := DefaultHilightBackgroundColor onDevice:device
+hilightBgColor := DefaultHilightBackgroundColor onDevice:graphicsDevice
 ] ifFalse:[
 hilightBgColor := bgColor.
 ].
 DefaultLineLevel notNil ifTrue:[
 lineLevel := DefaultLineLevel
 lineLevel := -1.
 ]
 ] ifFalse:[
 "some 2D style menu - set hilight defaults to inverse"
 DefaultHilightForegroundColor notNil ifTrue:[
-hilightFgColor := DefaultHilightForegroundColor onDevice:device
+hilightFgColor := DefaultHilightForegroundColor onDevice:graphicsDevice
 ] ifFalse:[
 hilightFgColor := bgColor.
 ].
 DefaultHilightBackgroundColor notNil ifTrue:[
-hilightBgColor := DefaultHilightBackgroundColor onDevice:device
+hilightBgColor := DefaultHilightBackgroundColor onDevice:graphicsDevice
 ] ifFalse:[
 hilightBgColor := fgColor.
 ].
 DefaultLineLevel notNil ifTrue:[
 lineLevel := DefaultLineLevel
 ].
 DefaultLineInset notNil ifTrue:[
 lineInset := DefaultLineInset
 ] ifFalse:[
-lineInset := (device horizontalPixelPerMillimeter * 0.8) rounded.
+lineInset := (graphicsDevice horizontalPixelPerMillimeter * 0.8) rounded.
 ].
 "
 the following has to be changed to
 use the styleSheet too
 "
 style := styleSheet name.
 (style == #iris) ifTrue:[
-device hasGrayscales ifTrue:[
+graphicsDevice hasGrayscales ifTrue:[
 lineSpacing := 3
 ].
 ].
 (style == #motif) ifTrue:[
 lineSpacing := (2 * hilightLevel)
 "/    ].
 (style == #st80) ifTrue:[
 level := 0.
 ].
 DefaultViewBackground notNil ifTrue:[
-viewBackground := DefaultViewBackground onDevice:device
+viewBackground := DefaultViewBackground onDevice:graphicsDevice
 ].
 "Modified: / 22-01-1997 / 11:57:23 / cg"
 "Modified (comment): / 05-10-2011 / 15:50:59 / az"
 !
 ].
 "stupid - have to redo this ..."
 hilightStyle == #openwin ifTrue:[
 "add some space for rounded-hilight area"
-self leftMargin:(font height " // 2" + 2 "inset of rounded rect") "10".
+self leftMargin:(gc font height " // 2" + 2 "inset of rounded rect") "10".
 ] ifFalse:[
 (hilightLevel ~~ 0) ifTrue:[
 self leftMargin:hilightLevel abs + margin abs + 1.
 lineSpacing := lineSpacing max:(hilightLevel abs * 2).
 ].
 font dimensions have changed on the display"
 super recreate.
 hilightStyle == #openwin ifTrue:[
 "add some space for rounded-hilight area"
-self leftMargin:(font height // 2 + 2 "inset of rounded rect") "10".
+self leftMargin:(gc font height // 2 + 2 "inset of rounded rect") "10".
 ] ifFalse:[
 (hilightLevel ~~ 0) ifTrue:[
 self leftMargin:hilightLevel abs + self margin abs + 1.
 lineSpacing := lineSpacing max:(hilightLevel abs * 2).
 ]
 self sendChangeMessageWith:val.
 "
 item actions or selectors-array
 "
-device activePointerGrab == self ifTrue:[
+self graphicsDevice activePointerGrab == self ifTrue:[
-device ungrabPointer.
+self graphicsDevice ungrabPointer.
 ].
 actions notNil ifTrue:[
 theAction := actions at:idx ifAbsent:nil.
 ].
 shortKeyInset
 "compute the width req'd for the shortKey"
 maxShortKeyStringLen isNil ifTrue:[
 shortKeys isNil ifTrue:[
 maxShortKeyStringLen := 0
 ] ifFalse:[
 maxShortKeyStringLen := shortKeys
 inject:0
 into:[:maxSoFar :thisKey | |short|
 thisKey isNil ifTrue:[
 maxSoFar
 ] ifFalse:[
-short := device shortKeyStringFor:thisKey.
+short := self graphicsDevice shortKeyStringFor:thisKey.
 short isNil ifTrue:[
 maxSoFar
 ] ifFalse:[
-maxSoFar max:(font widthOf:short)
+maxSoFar max:(gc font widthOf:short)
 ]
 ]
 ]
 ].
 ].
 "/    aModifier = 'Ctrl' ifTrue:[
 "/        ^ '^-'
 "/    ].
 "/    ^ aModifier.
-m := device modifierKeyTopFor:aModifier.
+m := self graphicsDevice modifierKeyTopFor:aModifier.
 m notNil ifTrue:[
 ^ m , '-'
 ].
 ^ aModifier.
 (m := subMenuShown) notNil ifTrue:[
 "/ race condition kludge ...
 m realized ifFalse:[
 (id := m id) notNil ifTrue:[
-device unmapWindow:id.
+self graphicsDevice unmapWindow:id.
 ]
 ] ifTrue:[
 m hide.
 ].
 my := self yOfVisibleLine:index.
 "
 need to know the physical screen coordinate,
 to map the subview there
 "
-org := device translatePoint:(mx @ my) fromView:self toView:nil.
+org := self graphicsDevice translatePoint:(mx @ my) fromView:self toView:nil.
 "
 before showing, process all of my expose events
 "
 "/    "/ mhmh - is this still needed ?
 "/    windowGroup notNil ifTrue:[
 "/        windowGroup processExposeEvents
 "/    ].
-menu topView device:device.   "/ req'd for multiDisplay operation
+menu topView device:self graphicsDevice.   "/ req'd for multiDisplay operation
 menu superMenu:self.
 actionBlock notNil ifTrue:[
 "/ mhmh - I am an ST-80 style menu
 "/ which does not send any messages to the receiver,
 "/ race condition kludge ...
 menu realized ifFalse:[
 menu realize.
 ] ifTrue:[
-device mapWindow:menu id.
+self graphicsDevice mapWindow:menu id.
 ].
 "/    device flush.
 menuOrBlock isBlock ifTrue:[
 blockOfSubMenuShown := menuOrBlock
 ] ifFalse:[
 ! !
 !MenuView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.183 2014-01-23 16:11:49 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.184 2014-02-18 14:56:00 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.183 2014-01-23 16:11:49 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.184 2014-02-18 14:56:00 stefan Exp $'
 ! !

changeset 4900	3598f62e2108
parent 4867	8bf409df4dc9
child 5048	8b7befa11c2f