<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text --><style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
</head>
<body>
<meta content="text/html; charset=UTF-8">
<style type="text/css" style="">
<!--
p
{margin-top:0;
margin-bottom:0}
-->
</style>
<div dir="ltr">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:#000000; font-family:Calibri,Helvetica,sans-serif">
<p><img size="70416" id="x_img559146" tabindex="0" style="max-width:99.9%" src="cid:1290314a-e657-4d2e-9c61-e43b9fce21ec"><br>
</p>
<div id="x_Signature">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif,EmojiFont,"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols">
<div name="x_divtagdefaultwrapper" style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:; margin:0">
<div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">
<div class="x__rp_U4 x_ms-font-weight-regular x_ms-font-color-neutralDark x_rpHighlightAllClass x_rpHighlightBodyClass" id="x_Item.MessageUniqueBody" style="font-family:wf_segoe-ui_normal,"Segoe UI","Segoe WP",Tahoma,Arial,sans-serif,serif,EmojiFont">
<div dir="ltr">
<div id="x_divtagdefaultwrapper"><font face="Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols">
<div id="x_Signature">
<div style="margin:0px"><font style="font-family:Calibri,Arial,Helvetica,sans-serif,serif,EmojiFont"></font></div>
</div>
</font></div>
</div>
</div>
</div>
</div>
<div><font size="2" color="#808080"></font></div>
</div>
</div>
</div>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>Von:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von commits@source.squeak.org <commits@source.squeak.org><br>
<b>Gesendet:</b> Samstag, 29. Februar 2020 11:46:56<br>
<b>An:</b> squeak-dev@lists.squeakfoundation.org<br>
<b>Betreff:</b> [squeak-dev] The Inbox: Morphic-ct.1634.mcz</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText">Christoph Thiede uploaded a new version of Morphic to project The Inbox:<br>
<a href="http://source.squeak.org/inbox/Morphic-ct.1634.mcz">http://source.squeak.org/inbox/Morphic-ct.1634.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Morphic-ct.1634<br>
Author: ct<br>
Time: 29 February 2020, 11:46:44.317896 am<br>
UUID: 71271fa2-4ed1-6d4f-8f58-30ed8165c367<br>
Ancestors: Morphic-mt.1631<br>
<br>
Proposal: Add pick button to NewColorPickerMorph that allows to pick a color from the Display. With this enhancement, NCPM is finally superior to the old ColorPickerMorph and could now replace the latter by the default preferences.<br>
<br>
=============== Diff against Morphic-mt.1631 ===============<br>
<br>
Item was changed:<br>
Morph subclass: #NewColorPickerMorph<br>
+ instanceVariableNames: 'target setColorSelector hsvaMorph colorPresenter isPicking'<br>
- instanceVariableNames: 'target setColorSelector hsvaMorph colorPresenter'<br>
classVariableNames: 'UseIt'<br>
poolDictionaries: ''<br>
category: 'Morphic-Widgets'!<br>
<br>
!NewColorPickerMorph commentStamp: 'cmm 12/3/2010 13:36' prior: 0!<br>
A NewColorPickerMorph is a new widget for choosing colors in Morphic. Instantiate a NewColorPickerMorph:<br>
<br>
(NewColorPickerMorph<br>
on: objectToHaveItsColorSet<br>
getColorSelector: itsColorGetterSymbol<br>
setColorSelector: itsColorSetterSymbol) openInWorld<br>
<br>
!<br>
<br>
Item was changed:<br>
----- Method: NewColorPickerMorph>>colorSelected: (in category 'model') -----<br>
colorSelected: aColor<br>
+ self isPicking ifFalse: [<br>
+ self targetColor: aColor].<br>
- self targetColor: aColor.<br>
self changed: #colorExpression!<br>
<br>
Item was changed:<br>
----- Method: NewColorPickerMorph>>initialize (in category 'initialize-release') -----<br>
initialize<br>
+ <br>
super initialize.<br>
+ isPicking := false.<br>
+ self initializeHsvaMorph.!<br>
- self initializeHsvaMorph!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>isPicking (in category 'accessing') -----<br>
+ isPicking<br>
+ <br>
+ ^ isPicking!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>isPicking: (in category 'picking') -----<br>
+ isPicking: aBoolean<br>
+ <br>
+ isPicking := aBoolean.<br>
+ self changed: #isPicking.<br>
+ aBoolean ifTrue: [self pickColor].!<br>
<br>
Item was changed:<br>
----- Method: NewColorPickerMorph>>newBottomRow (in category 'initialize-release') -----<br>
newBottomRow<br>
^ Morph new<br>
+ color: Color transparent;<br>
+ changeTableLayout;<br>
+ listDirection: #leftToRight;<br>
+ hResizing: #spaceFill; vResizing: #shrinkWrap;<br>
+ height: 20;<br>
+ cellGap: 4;<br>
+ addMorphBack: self newPickButton;<br>
+ addMorphBack: (StringMorph contents: 'Current selection:' translated);<br>
+ addMorphBack: self newColorPresenterMorph;<br>
+ addMorphBack: self newCloseButton;<br>
+ yourself!<br>
- color: Color transparent ;<br>
- changeTableLayout ;<br>
- listDirection: #leftToRight ;<br>
- hResizing: #spaceFill; vResizing: #shrinkWrap ;<br>
- height: 20 ;<br>
- cellGap: 4 ;<br>
- addMorph: (StringMorph contents: 'Current selection:' translated) ;<br>
- addMorphBack: self newColorPresenterMorph ;<br>
- addMorphBack: self newCloseButton!<br>
<br>
Item was changed:<br>
----- Method: NewColorPickerMorph>>newCloseButton (in category 'initialize-release') -----<br>
newCloseButton<br>
^ (PluggableButtonMorph<br>
on: self<br>
getState: nil<br>
action: #delete<br>
label: #closeButtonLabel)<br>
+ vResizing: #spaceFill;<br>
- vResizing: #spaceFill ;<br>
hResizing: #spaceFill;<br>
+ balloonText: self closeButtonLabel;<br>
+ yourself!<br>
- yourself!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>newPickButton (in category 'initialize-release') -----<br>
+ newPickButton<br>
+ ^ (PluggableButtonMorph<br>
+ on: self<br>
+ getState: #isPicking<br>
+ action: #togglePicking<br>
+ label: #pickingButtonLabel)<br>
+ vResizing: #spaceFill;<br>
+ hResizing: #spaceFill;<br>
+ balloonText: self pickingButtonLabel;<br>
+ yourself!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>pickColor (in category 'picking') -----<br>
+ pickColor<br>
+ <br>
+ | selectedColor |<br>
+ [<br>
+ | previousColor |<br>
+ previousColor := self selectedColor.<br>
+ selectedColor := self pickColorFromDisplay.<br>
+ selectedColor ifNil: [^ self selectedColor: previousColor].<br>
+ ] ensure: [<br>
+ self isPicking: false].<br>
+ self selectedColor: selectedColor.!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>pickColorFromDisplay (in category 'picking') -----<br>
+ pickColorFromDisplay<br>
+ <br>
+ [Sensor anyButtonPressed]<br>
+ whileTrue;<br>
+ whileFalse: [<br>
+ Sensor peekKeyboard = Character escape ifTrue: [<br>
+ Sensor flushKeyboard.<br>
+ ^ nil].<br>
+ ((ActiveHand world morphsAt: Sensor cursorPoint) includes: self) ifFalse: [<br>
+ self selectedColor: (Display colorAt: Sensor cursorPoint)].<br>
+ self world displayWorldSafely; runStepMethods].<br>
+ Sensor yellowButtonPressed<br>
+ ifTrue: [^ nil].<br>
+ ((ActiveHand world morphsAt: Sensor cursorPoint) includes: self)<br>
+ ifTrue: [^ nil].<br>
+ ^ self selectedColor!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>pickingButtonLabel (in category 'initialize-release') -----<br>
+ pickingButtonLabel<br>
+ ^ 'Picking' translated!<br>
<br>
Item was changed:<br>
----- Method: NewColorPickerMorph>>setup (in category 'initialize-release') -----<br>
setup<br>
+ <br>
self<br>
+ color: Color white darker;<br>
+ cornerStyle: #rounded;<br>
+ changeTableLayout;<br>
+ hResizing: #shrinkWrap;<br>
+ vResizing: #shrinkWrap;<br>
+ extent: 240@240;<br>
+ addMorphBack: hsvaMorph;<br>
+ addMorphBack: self newColorExpressionMorph;<br>
+ addMorphBack: self newBottomRow;<br>
+ layoutInset: 4;<br>
+ cellGap: 2.<br>
+ <br>
+ Preferences menuAppearance3d<br>
+ ifTrue: [self addDropShadow].!<br>
- color: (Color white darker) ;<br>
- cornerStyle: #rounded ;<br>
- changeTableLayout ;<br>
- hResizing: #shrinkWrap ;<br>
- vResizing: #shrinkWrap ;<br>
- extent: 240@240 ;<br>
- addMorphBack: hsvaMorph ;<br>
- addMorphBack: self newColorExpressionMorph ;<br>
- addMorphBack: self newBottomRow ;<br>
- layoutInset: 4 ;<br>
- cellGap: 2.<br>
- <br>
- Preferences menuAppearance3d<br>
- ifTrue: [self addDropShadow].<br>
- !<br>
<br>
Item was changed:<br>
----- Method: NewColorPickerMorph>>setupForProperties (in category 'initialize-release') -----<br>
setupForProperties<br>
+ <br>
self<br>
+ color: Color white darker;<br>
+ changeTableLayout;<br>
+ hResizing: #shrinkWrap;<br>
+ vResizing: #shrinkWrap;<br>
+ extent: 240@240;<br>
+ addMorphBack: hsvaMorph;<br>
+ layoutInset: 4;<br>
+ cellGap: 2.!<br>
- color: (Color white darker) ;<br>
- changeTableLayout ;<br>
- hResizing: #shrinkWrap ;<br>
- vResizing: #shrinkWrap ;<br>
- extent: 240@240 ;<br>
- addMorphBack: hsvaMorph ;<br>
- layoutInset: 4 ;<br>
- cellGap: 2.!<br>
<br>
Item was added:<br>
+ ----- Method: NewColorPickerMorph>>togglePicking (in category 'picking') -----<br>
+ togglePicking<br>
+ self isPicking: self isPicking not!<br>
<br>
<br>
</div>
</span></font>
</body>
</html>