<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>This looks so much more modern! Thank you! :-)</p>
<p><br>
</p>
<p>By the way, Cmd + L is not working in these mini-editors. But this is not a regression.</p>
<p><br>
</p>
<p>Best,</p>
<p>Christoph</p>
</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> Montag, 7. Februar 2022 11:04:15<br>
<b>An:</b> squeak-dev@lists.squeakfoundation.org; packages@lists.squeakfoundation.org<br>
<b>Betreff:</b> [squeak-dev] The Trunk: Morphic-mt.1874.mcz</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText">Marcel Taeumel uploaded a new version of Morphic to project The Trunk:<br>
<a href="http://source.squeak.org/trunk/Morphic-mt.1874.mcz">http://source.squeak.org/trunk/Morphic-mt.1874.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: Morphic-mt.1874<br>
Author: mt<br>
Time: 7 February 2022, 11:04:09.494414 am<br>
UUID: a70b7bc5-e1e8-a743-9ef9-d1f84ea1315c<br>
Ancestors: Morphic-mt.1873<br>
<br>
Fixes visual appearance of mini editor for StringMorph. For example, the one that comes when you SHIFT+Red-click a window title.<br>
<br>
Pull up #caretColor(:), #selectionColor(:), and #unfocusedSelectionColor(:) from TextMorphForEditView to TextMorph.<br>
<br>
=============== Diff against Morphic-mt.1873 ===============<br>
<br>
Item was changed:<br>
----- Method: StringMorph>>drawOn: (in category 'drawing') -----<br>
drawOn: aCanvas<br>
<br>
+ | drawBounds |<br>
+ drawBounds := self innerBounds. "within border, no other (layout) inset"<br>
+ drawBounds := drawBounds origin + (0 @ self fontToUse lineGapSliceForMorphs) corner: drawBounds corner.<br>
+ <br>
aCanvas<br>
drawString: self contents<br>
+ in: drawBounds<br>
- in: self innerBounds<br>
font: self fontToUse<br>
color: self color.!<br>
<br>
Item was removed:<br>
- ----- Method: StringMorph>>innerBounds (in category 'geometry - layout') -----<br>
- innerBounds<br>
- "Overwritten to respect the receiver's font's #lineGap."<br>
- <br>
- | b |<br>
- b := super innerBounds.<br>
- ^ b origin + (0 @ self fontToUse lineGapSliceForMorphs) corner: b corner!<br>
<br>
Item was changed:<br>
----- Method: StringMorph>>launchMiniEditor: (in category 'editing') -----<br>
launchMiniEditor: evt<br>
<br>
| textMorph |<br>
hasFocus := true. "Really only means edit in progress for this morph"<br>
textMorph := StringMorphEditor new contentsAsIs: contents.<br>
+ textMorph font: self fontToUse.<br>
+ textMorph color: self color.<br>
+ textMorph innerBounds: self innerBounds.<br>
- textMorph beAllFont: self fontToUse.<br>
- textMorph bounds: (self bounds expandBy: 0@2).<br>
self addMorphFront: textMorph.<br>
evt hand newKeyboardFocus: textMorph.<br>
textMorph editor selectFrom: 1 to: textMorph paragraph text string size!<br>
<br>
Item was removed:<br>
- ----- Method: StringMorphEditor>>drawOn: (in category 'drawing') -----<br>
- drawOn: aCanvas<br>
- <br>
- aCanvas fillRectangle: self bounds color: Color yellow muchLighter.<br>
- ^ super drawOn: aCanvas!<br>
<br>
Item was changed:<br>
----- Method: StringMorphEditor>>initialize (in category 'display') -----<br>
initialize<br>
"Initialize the receiver. Give it a white background"<br>
<br>
super initialize.<br>
+ self setDefaultParameters.!<br>
- self backgroundColor: Color white.<br>
- self textColor: Color red.!<br>
<br>
Item was added:<br>
+ ----- Method: StringMorphEditor>>setDefaultParameters (in category 'display') -----<br>
+ setDefaultParameters<br>
+ "Based on PluggableTextMorph >> #setDefaultParameters."<br>
+ <br>
+ self<br>
+ backgroundColor: ((UserInterfaceTheme current get: #color for: #ScrollPane) ifNil: [Color white]);<br>
+ borderStyle: ((UserInterfaceTheme current get: #borderStyle for: #ScrollPane) ifNil: [BorderStyle simple]) copy;<br>
+ borderColor: ((UserInterfaceTheme current get: #borderColor for: #ScrollPane) ifNil: [Color gray: 0.6]);<br>
+ borderWidth: (((UserInterfaceTheme current get: #borderWidth for: #ScrollPane) ifNil: [1]) * RealEstateAgent scaleFactor) truncated.<br>
+ <br>
+ self<br>
+ caretColor: ((UserInterfaceTheme current get: #caretColor for: #PluggableTextMorph) ifNil: [Color red]);<br>
+ selectionColor: ((UserInterfaceTheme current get: #selectionColor for: #PluggableTextMorph) ifNil: [TranslucentColor r: 0.0 g: 0.0 b: 0.8 alpha: 0.2]).<br>
+ <br>
+ self setProperty: #indicateKeyboardFocus toValue: #never.!<br>
<br>
Item was added:<br>
+ ----- Method: TextMorph>>caretColor (in category 'accessing') -----<br>
+ caretColor<br>
+ ^ self valueOfProperty: #caretColor ifAbsent: [Color red]!<br>
<br>
Item was added:<br>
+ ----- Method: TextMorph>>caretColor: (in category 'accessing') -----<br>
+ caretColor: aColor<br>
+ self<br>
+ setProperty: #caretColor<br>
+ toValue: aColor.!<br>
<br>
Item was changed:<br>
----- Method: TextMorph>>createParagraph (in category 'private') -----<br>
createParagraph<br>
<br>
self setProperty: #CreatingParagraph toValue: true.<br>
<br>
[<br>
self setDefaultContentsIfNil.<br>
<br>
"...Code here to recreate the paragraph..."<br>
paragraph := (self paragraphClass new textOwner: self owner).<br>
paragraph wantsColumnBreaks: successor notNil.<br>
paragraph<br>
compose: text<br>
style: textStyle copy<br>
from: self startingIndex<br>
in: self container.<br>
wrapFlag ifFalse:<br>
["Was given huge container at first... now adjust"<br>
paragraph adjustRightX].<br>
paragraph focused: (self currentHand keyboardFocus == self).<br>
+ <br>
+ paragraph<br>
+ caretColor: self caretColor;<br>
+ selectionColor: self selectionColor;<br>
+ unfocusedSelectionColor: self unfocusedSelectionColor.<br>
+ <br>
- <br>
self fit.<br>
] ensure: [self removeProperty: #CreatingParagraph].<br>
<br>
^ paragraph!<br>
<br>
Item was added:<br>
+ ----- Method: TextMorph>>selectionColor (in category 'accessing') -----<br>
+ selectionColor<br>
+ ^ self valueOfProperty: #selectionColor ifAbsent: [Color blue muchLighter]!<br>
<br>
Item was added:<br>
+ ----- Method: TextMorph>>selectionColor: (in category 'accessing') -----<br>
+ selectionColor: aColor<br>
+ <br>
+ self<br>
+ setProperty: #selectionColor<br>
+ toValue: aColor.!<br>
<br>
Item was added:<br>
+ ----- Method: TextMorph>>unfocusedSelectionColor (in category 'accessing') -----<br>
+ unfocusedSelectionColor<br>
+ ^ self valueOfProperty: #unfocusedSelectionColor ifAbsent: [Color blue muchLighter]!<br>
<br>
Item was added:<br>
+ ----- Method: TextMorph>>unfocusedSelectionColor: (in category 'accessing') -----<br>
+ unfocusedSelectionColor: aColor<br>
+ <br>
+ self<br>
+ setProperty: #unfocusedSelectionColor<br>
+ toValue: aColor.!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>caretColor (in category 'accessing') -----<br>
- caretColor<br>
- ^ self valueOfProperty: #caretColor ifAbsent: [Color red]!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>caretColor: (in category 'accessing') -----<br>
- caretColor: aColor<br>
- self<br>
- setProperty: #caretColor<br>
- toValue: aColor.!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>createParagraph (in category 'private') -----<br>
- createParagraph<br>
- <br>
- super createParagraph.<br>
- <br>
- paragraph<br>
- caretColor: self caretColor;<br>
- selectionColor: self selectionColor;<br>
- unfocusedSelectionColor: self unfocusedSelectionColor.<br>
- <br>
- ^ paragraph!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>selectionColor (in category 'accessing') -----<br>
- selectionColor<br>
- ^ self valueOfProperty: #selectionColor ifAbsent: [Color blue muchLighter]!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>selectionColor: (in category 'accessing') -----<br>
- selectionColor: aColor<br>
- <br>
- self<br>
- setProperty: #selectionColor<br>
- toValue: aColor.!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>unfocusedSelectionColor (in category 'accessing') -----<br>
- unfocusedSelectionColor<br>
- ^ self valueOfProperty: #unfocusedSelectionColor ifAbsent: [Color blue muchLighter]!<br>
<br>
Item was removed:<br>
- ----- Method: TextMorphForEditView>>unfocusedSelectionColor: (in category 'accessing') -----<br>
- unfocusedSelectionColor: aColor<br>
- <br>
- self<br>
- setProperty: #unfocusedSelectionColor<br>
- toValue: aColor.!<br>
<br>
<br>
</div>
</span></font>
</body>
</html>