The Trunk: Morphic-mt.1224.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-mt.1224.mcz

commits-2
Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1224.mcz

==================== Summary ====================

Name: Morphic-mt.1224
Author: mt
Time: 2 August 2016, 4:54:34.680305 pm
UUID: 97c9810e-903b-7a4b-bb15-7c15ee3be3a9
Ancestors: Morphic-mt.1223

Use a wireframe fullscreen icon, which is colorizable/themeable, for the docking bar. Just like the Squeak icon.

=============== Diff against Morphic-mt.1223 ===============

Item was added:
+ ----- Method: MenuIcons class>>fullscreenWireframeIcon (in category 'accessing - icons') -----
+ fullscreenWireframeIcon
+ "(c) 2016, Plainicon on www.flaticon.com
+ http://www.flaticon.com/free-icon/square-frame_79288
+ CC 3.0 BY http://creativecommons.org/licenses/by/3.0/"
+
+ ^ Icons
+ at: #fullscreenWireframeIcon
+ ifAbsentPut: [  (Form
+ extent: 16@16
+ depth: 32
+ fromArray: #( 1543503871 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 1543503871 2298478591 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2298478591 2298478591 0 3254779903 2298478591 2281701375 285212671 0 0 0 0 301989887 2281701375 2298478591 3254779903 0 2298478591 2298478591 0 2298478591 0 0 0 0 0 0 0 0 0 0 2298478591 0 2298478591 2298478591 0 2298478591 0 0 0 0 0 0 0 0 0 0 2298478591 0 2298478591 2298478591 0 251658239 0 0 0 0 0 0 0 0 0 0 251658239 0 2298478591 2298478591 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2298478591 2298478591 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2298478591 2298478591 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2298478591 2298478591 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2298478591 2298478591 0 251658239 0 0 0 0 0 0 0 0 0 0 251658239 0 2298478591 2298478591 0 2298478591 0 0 0 0 0 0 0 0 0 0 2298478591 0 2298478591 2298478591 0 2298478591 0 0 0 0 0 0 0 0 0 0 2298478591 0 2298478591 2298478591 0 3288334335 2298478591 2281701375 285212671 0 0 0 0 301989887 2281701375 2298478591 3288334335 0 2298478591 2298478591 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2298478591 1476395007 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 2583691263 1459617791)
+ offset: 0@0) ]!

Item was added:
+ ----- Method: MenuIcons class>>fullscreenWireframeIconColorized: (in category 'accessing - icons') -----
+ fullscreenWireframeIconColorized: aColor
+
+ ^ self fullscreenWireframeIcon
+ collectColors: [:c | aColor alpha: c alpha]!

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  box |
- toggleMorph := (SketchMorph withForm: MenuIcons smallFullscreenOffIcon).
 
+ toggleMorph := offIcon asMorph.
+
  box := Morph new
  color: Color transparent;
+ hResizing: #shrinkWrap;
  vResizing: #spaceFill;
  width: toggleMorph width;
+ changeTableLayout;
+
+ borderWidth: 1;
+ borderColor: Color transparent;
  balloonText: 'toggle full screen mode' translated;
  addMorph: toggleMorph.
 
  toggleMorph setToAdhereToEdge: #rightCenter.
 
  box
+ on: #mouseUp
- on: #mouseDown
  send: #value
  to:
  [ DisplayScreen toggleFullScreen.
+ "toggleMorph image: MenuIcons smallFullscreenOffIcon" ] ;
- toggleMorph form: MenuIcons smallFullscreenOffIcon ] ;
 
  on: #mouseEnter
  send: #value
+ to: [
+ toggleMorph image: onIcon.
+ box color: bgColor; borderColor: bgColor];
- to: [toggleMorph form: MenuIcons smallFullscreenOnIcon];
 
  on: #mouseLeave
  send: #value
+ to: [
+ toggleMorph image: offIcon.
+ box color: Color transparent; borderColor: Color transparent].
- to: [toggleMorph form: MenuIcons smallFullscreenOffIcon].
 
  aDockingBar addMorphBack: box!