Skip to content

Commit

Permalink
Merge 223db5f
Browse files Browse the repository at this point in the history
  • Loading branch information
tinchodias committed Jul 26, 2024
2 parents 5f8f929 + 223db5f commit a5fe2d3
Show file tree
Hide file tree
Showing 38 changed files with 15 additions and 1,010 deletions.
12 changes: 6 additions & 6 deletions src/Bloc-Alexandrie-Exporter/BAExporter.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@ BAExporter >> element: aBlElement [

{ #category : #'api - exporting' }
BAExporter >> export [

| aCanvas aBounds |
element forceLayout.
element isLayoutRequested ifTrue: [ element forceLayout ].

aBounds := element invalidationBoundsInSpace.
aCanvas := self newCanvas: (aBounds extent * scale).
aBounds := element invalidationBoundsInParent.

aCanvas := self newCanvas: aBounds extent * scale.

aCanvas
clear: self background;
pathScale: scale asPoint;
pathTranslate: aBounds origin negated.
element aeFullDrawOn: aCanvas.

^ self finishExport: aCanvas
]

Expand Down
11 changes: 0 additions & 11 deletions src/Bloc-Alexandrie-Exporter/BAFileExporter.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,6 @@ BAFileExporter >> extension [
^ self subclassResponsibility
]

{ #category : #accessing }
BAFileExporter >> fileName: aFileReference [

self
deprecated: 'Use target: instead'
transformWith: '`@receiver fileName: `@argument'
-> '`@receiver target: `@argument'.

self target: aFileReference
]

{ #category : #private }
BAFileExporter >> finishExport: aeCanvas [

Expand Down
15 changes: 2 additions & 13 deletions src/Bloc-Alexandrie/BlElement.extension.st
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ BlElement >> aeAsForm [
self isLayoutRequested ifTrue: [ self forceLayout ].

"We want to consider our border, effect, as well as children's."
invalidationBounds := self invalidationBoundsInSpace.
invalidationBounds := self invalidationBoundsInParent.
aCanvas := AeCanvas extent: invalidationBounds extent.
aCanvas pathTranslate: invalidationBounds origin negated.

self aeFullDrawOn: aCanvas.
^ aCanvas asForm
]
Expand Down Expand Up @@ -137,18 +138,6 @@ BlElement >> aeDrawOn: aeCanvas [
self aeDrawIgnoringOpacityAndTransformationOn: aeCanvas ]
]

{ #category : #'*Bloc-Alexandrie' }
BlElement >> aeDrawOn: aeCanvas with: aBlockClosure [

self
deprecated: 'Use AeCanvas API directly'
transformWith:
'`@rcv aeDrawOn: `@arg1 with: `@arg2' ->
'`@arg1 restoreContextAfterPaintAlpha: `@rcv opacity with: `@arg2'.

aeCanvas restoreContextAfterPaintAlpha: self opacity with: aBlockClosure
]

{ #category : #'*Bloc-Alexandrie' }
BlElement >> aeFullDrawOn: aCanvas [
"Main entry point to draw myself and my children on an Alexandrie canvas."
Expand Down
10 changes: 0 additions & 10 deletions src/Bloc-Alexandrie/BlSpace.extension.st
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
Extension { #name : #BlSpace }

{ #category : #'*Bloc-Alexandrie' }
BlSpace >> aeAsForm [

self
deprecated: 'Send #aeAsForm to my root instead'
transformWith: '`@rcv aeAsForm' -> '`@rcv root aeAsForm'.

^ self root aeAsForm
]

{ #category : #'*Bloc-Alexandrie' }
BlSpace >> aeFullDrawOn: aeCanvas [

Expand Down
11 changes: 0 additions & 11 deletions src/Bloc-Animation/BlCompositeAnimation.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,6 @@ Class {
#category : #'Bloc-Animation-Basic'
}

{ #category : #'instance creation' }
BlCompositeAnimation class >> with: aCollectionOfAnimations [

self
deprecated: 'Please use #withAll: instead'
transformWith: '`@receiver with: `@arg'
-> '`@receiver withAll: `@arg'.

^ self new addAll: aCollectionOfAnimations
]

{ #category : #'instance creation' }
BlCompositeAnimation class >> with: anAnimation with: anotherAnimation [

Expand Down
10 changes: 0 additions & 10 deletions src/Bloc-DevTool/BlSpace.extension.st
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,3 @@ BlSpace >> addHalosListener [

self root addEventFilter: BlDevHalosEventListener new
]

{ #category : #'*Bloc-DevTool' }
BlSpace >> withHalos [

self
deprecated: 'Please use #addHalosListener'
transformWith: '`@receiver withHalos' -> '`@receiver addHalosListener'.

self addHalosListener
]
24 changes: 0 additions & 24 deletions src/Bloc-Text-Elements/BlTextElement.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,6 @@ BlTextElement class >> text: aBlText [
yourself
]

{ #category : #accessing }
BlTextElement >> baseline [

self
deprecated: 'Please use baselineMeasurer instead.'
transformWith:
'`@receiver baseline'
-> '`@receiver baselineMeasurer'.

^ self baselineMeasurer
]

{ #category : #accessing }
BlTextElement >> baselineMeasurer [

Expand Down Expand Up @@ -483,18 +471,6 @@ BlTextElement >> paragraph [
^ paragraph
]

{ #category : #accessing }
BlTextElement >> rawParagraph [

self
deprecated: 'Please use paragraph instead.'
transformWith:
'`@receiver rawParagraph'
-> '`@receiver paragraph'.

^ self paragraph
]

{ #category : #'private - paragraph' }
BlTextElement >> releaseParagraph [
paragraph := nil
Expand Down
15 changes: 0 additions & 15 deletions src/Bloc-Text/BlRBTextStyler.class.st

This file was deleted.

20 changes: 0 additions & 20 deletions src/Bloc-Text/BlTextDecorationAttribute.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ BlTextDecorationAttribute >> overline [
decoration withOverline
]

{ #category : #'api - decoration' }
BlTextDecorationAttribute >> paint: aColor [
self
deprecated: 'Use color: instead'
transformWith: '`@receiver paint: `@statements1'
-> '`@receiver color: `@statements1'.

self color: aColor
]

{ #category : #printing }
BlTextDecorationAttribute >> printOn: aStream [

Expand Down Expand Up @@ -115,13 +105,3 @@ BlTextDecorationAttribute >> underline [
BlTextDecorationAttribute >> wavy [
decoration wavy
]

{ #category : #'api - decoration' }
BlTextDecorationAttribute >> width: aNumber [
self
deprecated: 'Use thickness: instead'
transformWith: '`@receiver width: `@statements1'
-> '`@receiver thickness: `@statements1'.

self thickness: aNumber
]
13 changes: 0 additions & 13 deletions src/Bloc-Text/BlTextParagraph.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,6 @@ BlTextParagraph >> baseline [
^ baselineMeasurer computedBaseline: self
]

{ #category : #'api - instantiation' }
BlTextParagraph >> baseline: aBlTextParagraphBaselineMeasurer [

self
deprecated: 'Please use baselineMeasurer: instead.'
transformWith:
'`@receiver baseline: `@statements1'
-> '`@receiver baselineMeasurer: `@statements1'.

self baselineMeasurer: aBlTextParagraphBaselineMeasurer.

]

{ #category : #'paragraph - geometry' }
BlTextParagraph >> baselineChanged [
"I should be sent when baseline needs to be recomputed"
Expand Down
11 changes: 0 additions & 11 deletions src/Bloc-Text/BlTextParagraphAscentLooseBaseline.class.st

This file was deleted.

11 changes: 0 additions & 11 deletions src/Bloc-Text/BlTextParagraphAscentTightBaseline.class.st

This file was deleted.

11 changes: 0 additions & 11 deletions src/Bloc-Text/BlTextParagraphBoundsBaseline.class.st

This file was deleted.

10 changes: 0 additions & 10 deletions src/Bloc-Text/TBlTextStyleable.trait.st
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,6 @@ TBlTextStyleable >> underlineDo: aBlock [
self decorationDo: [ :aBlTextDecorationAttribute | aBlock value: aBlTextDecorationAttribute underline ]
]

{ #category : #'api - text decoration' }
TBlTextStyleable >> underlinePaint: aColor width: aNumber [
self
deprecated: 'Use underlineColor:thickness: instead'
transformWith: '`@receiver underlinePaint: `@statements1 width: `@statements2'
-> '`@receiver underlineColor: `@statements1 thickness: `@statements2'.

self underlineColor: aColor thickness: aNumber
]

{ #category : #'api - text orientation' }
TBlTextStyleable >> vertical [

Expand Down
20 changes: 0 additions & 20 deletions src/Bloc/BlCompositeSelection.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@ BlCompositeSelection >> deselectAll [
self deselect: aMonotoneSelection from to: aMonotoneSelection to ]
]

{ #category : #'api - selection' }
BlCompositeSelection >> deselectAllIndexes: aCollection [

self
deprecated: 'Use deselectIndexes: instead'
transformWith: '`@receiver deselectAllIndexes: `@argument'
-> '`@receiver deselectIndexes: `@argument'.
self deselectIndexes: aCollection
]

{ #category : #'api - selection' }
BlCompositeSelection >> deselectIndex: anIndex [
"Remove a given selection"
Expand Down Expand Up @@ -237,16 +227,6 @@ BlCompositeSelection >> select: aFromIndex to: aToIndex [
self add: (BlSelection from: (aFromIndex max: 0) to: aToIndex)
]

{ #category : #'api - selection' }
BlCompositeSelection >> selectAllIndexes: aCollection [

self
deprecated: 'Use selectIndexes: instead'
transformWith: '`@receiver selectAllIndexes: `@argument'
-> '`@receiver selectIndexes: `@argument'.
self selectIndexes: aCollection
]

{ #category : #'api - selection' }
BlCompositeSelection >> selectIndex: anIndex [
"add a given selection"
Expand Down
Loading

0 comments on commit a5fe2d3

Please sign in to comment.