# HG changeset patch # User Claus Gittinger # Date 1343431624 -7200 # Node ID f2c0566732e7e846eb8fc9fb66d531e88e8e054b # Parent 46d42e6fecbc4c7ab79bb310b2ac925efc76ffaa codeAspect fixes (almost) diff -r 46d42e6fecbc -r f2c0566732e7 Tools__ChangeList.st --- a/Tools__ChangeList.st Sat Jul 28 01:25:28 2012 +0200 +++ b/Tools__ChangeList.st Sat Jul 28 01:27:04 2012 +0200 @@ -1022,8 +1022,8 @@ ! label + | label | - | label | label := change displayString. self removed ifTrue:[label := label asText colorizeAllWith: Color gray]. ^label @@ -1031,6 +1031,7 @@ "Created: / 05-11-2008 / 08:20:02 / Jan Vrany " "Modified: / 25-07-2009 / 23:43:23 / Jan Vrany " "Modified: / 05-12-2009 / 14:46:00 / Jan Vrany " + "Modified (format): / 27-07-2012 / 21:26:34 / cg" ! removed @@ -1053,21 +1054,24 @@ !ChangeList::ListEntry methodsFor:'displaying'! displayLabel:aLabel h:lH on:aGC x:newX y:y h:h + | cx icon | - | cx icon | cx := x := newX. - self application allowRemoveHolder value ifTrue: - [(icon := self iconRemoved) ifNotNil: - [icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) ]. - cx := cx + 22."experimental value - this looks good"]. - (icon := self iconDelta) ifNotNil: - [icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) ]. + self application allowRemoveHolder value ifTrue:[ + (icon := self iconRemoved) notNil ifTrue:[ + icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) + ]. + cx := cx + 22."experimental value - this looks good" + ]. + (icon := self iconDelta) notNil ifTrue:[ + icon displayOn: aGC x: cx y: y + (h / 2) - (icon height / 2) + ]. cx := cx + 16."12 + 2px gap" - super displayLabel:aLabel h:lH on:aGC x:cx y:y h:h "Modified: / 24-01-2012 / 21:44:21 / Jan Vrany " + "Modified: / 27-07-2012 / 21:26:23 / cg" ! ! !ChangeList::ListEntry methodsFor:'private'! @@ -1088,20 +1092,20 @@ !ChangeList::ListEntry methodsFor:'protocol-queries'! hasChildren - ^ change isCompositeChange and:[change changes notEmptyOrNil ]. "Created: / 04-12-2011 / 14:45:55 / Jan Vrany " + "Modified (format): / 27-07-2012 / 21:25:34 / cg" ! ! !ChangeList class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.16 2012-07-25 23:18:13 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.17 2012-07-27 23:27:04 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.16 2012-07-25 23:18:13 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.17 2012-07-27 23:27:04 cg Exp $' ! version_SVN