equal
deleted
inserted
replaced
339 |
339 |
340 !ChangeSetDiffList::ListEntry methodsFor:'displaying'! |
340 !ChangeSetDiffList::ListEntry methodsFor:'displaying'! |
341 |
341 |
342 displayOn: aGC x: x y: y opaque: opaque |
342 displayOn: aGC x: x y: y opaque: opaque |
343 |
343 |
344 | icon | |
344 | icon oldPaint | |
345 (icon := self icon) ifNotNil:[icon displayOn: aGC x: x y: y - icon height opaque: opaque]. |
345 ((application topApplication askFor:#isMerge) and:[model isMerged not]) ifTrue:[ |
346 self label displayOn: aGC x: x + 16 y:y opaque: opaque |
346 oldPaint := aGC paint. |
|
347 aGC paint: TextDiff3Tool colorConflict. |
|
348 '!!' displayOn: aGC x: x y:y opaque: opaque. |
|
349 aGC paint: oldPaint. |
|
350 ]. |
|
351 (icon := self icon) ifNotNil:[icon displayOn: aGC x: x + 10 y: y - icon height opaque: opaque]. |
|
352 self label displayOn: aGC x: x + 10 + 16 y:y opaque: opaque |
347 |
353 |
348 "Created: / 24-11-2009 / 18:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
354 "Created: / 24-11-2009 / 18:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
349 ! ! |
355 ! ! |
350 |
356 |
351 !ChangeSetDiffList class methodsFor:'documentation'! |
357 !ChangeSetDiffList class methodsFor:'documentation'! |
353 version_CVS |
359 version_CVS |
354 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffList.st,v 1.6 2011/11/30 11:14:53 vrany Exp §' |
360 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffList.st,v 1.6 2011/11/30 11:14:53 vrany Exp §' |
355 ! |
361 ! |
356 |
362 |
357 version_SVN |
363 version_SVN |
358 ^ '$Id: Tools__ChangeSetDiffList.st 7854 2012-01-30 17:49:41Z vranyj1 $' |
364 ^ '$Id: Tools__ChangeSetDiffList.st 7944 2012-03-19 15:32:45Z vranyj1 $' |
359 ! ! |
365 ! ! |