Smalltalk › Squeak › Squeak - Dev

The Trunk: Morphic-mt.1444.mcz

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

3 messages Options

commits-2

The Trunk: Morphic-mt.1444.mcz

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

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

Name: Morphic-mt.1444
Author: mt
Time: 31 May 2018, 9:28:12.813323 am
UUID: d41ef171-b992-1a4e-b2d5-009f0e9e3134
Ancestors: Morphic-cmm.1443

Reverts the change from Morphic-cmm.1443 about borderStyle to make test04InnerBounds in BorderedMorphTests green again.

=============== Diff against Morphic-cmm.1443 ===============

Item was changed:
----- Method: Morph>>borderStyle: (in category 'accessing') -----
borderStyle: aBorderStyle
+
aBorderStyle = self borderStyle ifTrue: [^ self].
+
"If we cannot draw the new border, accept at least its color and width."
((self canDrawBorder: aBorderStyle) or: [aBorderStyle isNil])
ifTrue: [self setProperty: #borderStyle toValue: aBorderStyle]
ifFalse: [
self borderStyle
width: aBorderStyle width;
baseColor: aBorderStyle baseColor].
+
self borderStyle trackColorFrom: self.
+
+ self
+ layoutChanged;
+ changed.!
- self isInWorld ifTrue:
- [ self
- layoutChanged;
- changed ]!

Chris Muller-3

Re: The Trunk: Morphic-mt.1444.mcz

You just broke Connectors again, Marcel.

On Thu, May 31, 2018 at 2:28 AM, <[hidden email]> wrote:

> Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
> http://source.squeak.org/trunk/Morphic-mt.1444.mcz
>
> ==================== Summary ====================
>
> Name: Morphic-mt.1444
> Author: mt
> Time: 31 May 2018, 9:28:12.813323 am
> UUID: d41ef171-b992-1a4e-b2d5-009f0e9e3134
> Ancestors: Morphic-cmm.1443
>
> Reverts the change from Morphic-cmm.1443 about borderStyle to make test04InnerBounds in BorderedMorphTests green again.
>
> =============== Diff against Morphic-cmm.1443 ===============
>
> Item was changed:
> ----- Method: Morph>>borderStyle: (in category 'accessing') -----
> borderStyle: aBorderStyle
> +
> aBorderStyle = self borderStyle ifTrue: [^ self].
> +
> "If we cannot draw the new border, accept at least its color and width."
> ((self canDrawBorder: aBorderStyle) or: [aBorderStyle isNil])
> ifTrue: [self setProperty: #borderStyle toValue: aBorderStyle]
> ifFalse: [
> self borderStyle
> width: aBorderStyle width;
> baseColor: aBorderStyle baseColor].
> +
> self borderStyle trackColorFrom: self.
> +
> + self
> + layoutChanged;
> + changed.!
> - self isInWorld ifTrue:
> - [ self
> - layoutChanged;
> - changed ]!
>
>

marcel.taeumel

Re: The Trunk: Morphic-mt.1444.mcz

I submitted a fix to that Connectors package. Please Update. That change in the Morphic code was not okay. Also not considering #borderWidth: and #borderColor: methods.

Best,

Marcel

Am 31.05.2018 18:36:00 schrieb Chris Muller <[hidden email]>:
You just broke Connectors again, Marcel.

On Thu, May 31, 2018 at 2:28 AM, wrote:
> Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
> http://source.squeak.org/trunk/Morphic-mt.1444.mcz
>
> ==================== Summary ====================
>
> Name: Morphic-mt.1444
> Author: mt
> Time: 31 May 2018, 9:28:12.813323 am
> UUID: d41ef171-b992-1a4e-b2d5-009f0e9e3134
> Ancestors: Morphic-cmm.1443
>
> Reverts the change from Morphic-cmm.1443 about borderStyle to make test04InnerBounds in BorderedMorphTests green again.
>
> =============== Diff against Morphic-cmm.1443 ===============
>
> Item was changed:
> ----- Method: Morph>>borderStyle: (in category 'accessing') -----
> borderStyle: aBorderStyle
> +
> aBorderStyle = self borderStyle ifTrue: [^ self].
> +
> "If we cannot draw the new border, accept at least its color and width."
> ((self canDrawBorder: aBorderStyle) or: [aBorderStyle isNil])
> ifTrue: [self setProperty: #borderStyle toValue: aBorderStyle]
> ifFalse: [
> self borderStyle
> width: aBorderStyle width;
> baseColor: aBorderStyle baseColor].
> +
> self borderStyle trackColorFrom: self.
> +
> + self
> + layoutChanged;
> + changed.!
> - self isInWorld ifTrue:
> - [ self
> - layoutChanged;
> - changed ]!
>
>