[squeak-dev] The Trunk: Morphic-mt.1290.mcz
commits at source.squeak.org
commits at source.squeak.org
Fri Aug 19 16:28:22 UTC 2016
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1290.mcz
==================== Summary ====================
Name: Morphic-mt.1290
Author: mt
Time: 19 August 2016, 6:27:47.365803 pm
UUID: 3ac6e74f-c6c7-cf46-98e3-f54b7e5ae340
Ancestors: Morphic-mt.1289
Fixes minor layout issues when switching to/from demo/hi-dpi mode. Considering open sytsem windows, this is still far from perfect but okay.
=============== Diff against Morphic-mt.1289 ===============
Item was changed:
----- Method: SimpleHierarchicalListMorph>>applyUserInterfaceTheme (in category 'updating') -----
applyUserInterfaceTheme
+ super applyUserInterfaceTheme.
+ self adjustSubmorphPositions.!
- super applyUserInterfaceTheme.!
Item was changed:
----- Method: SystemWindow>>extent: (in category 'geometry') -----
extent: aPoint
"Set the receiver's extent to value provided. Respect my minimumExtent."
| newExtent |
newExtent := self isCollapsed
ifTrue: [aPoint]
ifFalse: [aPoint max: self minimumExtent].
newExtent = self extent ifTrue: [^ self].
isCollapsed
+ ifTrue: [super extent: newExtent x @ (self labelHeight + (self layoutInset * 2))]
- ifTrue: [super extent: newExtent x @ (self labelHeight + 2)]
ifFalse: [super extent: newExtent].
isCollapsed
ifTrue: [collapsedFrame := self bounds]
ifFalse: [fullFrame := self bounds]!
Item was changed:
----- Method: SystemWindow>>labelHeight (in category 'label') -----
labelHeight
"Answer the height for the window label. The standard behavior is at bottom; a hook is provided so that models can stipulate other heights, in support of various less-window-looking demos."
| aHeight |
(model notNil and: [model respondsTo: #desiredWindowLabelHeightIn:]) ifTrue:
[(aHeight := model desiredWindowLabelHeightIn: self) ifNotNil: [^ aHeight]].
^ label ifNil: [0] ifNotNil:
+ [(label height + self cellInset + self layoutInset) max:
- [(label height + (self class borderWidth * 2)) max:
(collapseBox ifNotNil: [collapseBox height] ifNil: [10])]!
Item was changed:
----- Method: TheWorldMainDockingBar>>toggleFullScreenOn: (in category 'right side') -----
toggleFullScreenOn: aDockingBar
| toggleMorph onIcon offIcon box bgColor |
offIcon := MenuIcons fullscreenWireframeIconColorized:
(self userInterfaceTheme logoColor ifNil: [Color black]).
onIcon := MenuIcons fullscreenWireframeIconColorized:
(self userInterfaceTheme selectionLogoColor ifNil: [Color white]).
bgColor := (UserInterfaceTheme current get: #selectionColor for: #DockingBarItemMorph) ifNil: [Color blue].
toggleMorph := offIcon asMorph.
box := Morph new
color: Color transparent;
hResizing: #shrinkWrap;
vResizing: #spaceFill;
+ listCentering: #center;
width: toggleMorph width;
changeTableLayout;
borderWidth: 1;
borderColor: Color transparent;
balloonText: 'toggle full screen mode' translated;
addMorph: toggleMorph.
toggleMorph setToAdhereToEdge: #rightCenter.
box
on: #mouseUp
send: #value
to:
[ DisplayScreen toggleFullScreen.
"toggleMorph image: MenuIcons smallFullscreenOffIcon" ] ;
on: #mouseEnter
send: #value
to: [
toggleMorph image: onIcon.
box color: bgColor; borderColor: bgColor];
on: #mouseLeave
send: #value
to: [
toggleMorph image: offIcon.
box color: Color transparent; borderColor: Color transparent].
aDockingBar addMorphBack: box!
More information about the Squeak-dev
mailing list
|