Merge 25400ac

JurajKubelka · JurajKubelka · commit d3c8e7ecc9dc · 2024-08-07T15:06:33.000+02:00
diff --git a/src/Brick-Glamorous/BrGlamorousVectorIcons.class.st b/src/Brick-Glamorous/BrGlamorousVectorIcons.class.st
@@ -419,6 +419,18 @@ BrGlamorousVectorIcons class >> largePlay [
 		background: Color black ] asStencil
 ]
 
+{ #category : #icons }
+BrGlamorousVectorIcons class >> largePlayAsynchronous [
+	<script: 'self largeParallelPlay inspect'>
+
+	^ [ BlElement new
+		size: 128@64;
+		geometry: (BlSvgPath new
+			svg: 'M 10.506208 3.0563515 L 53.95177 32.020057 L 10.506208 60.98376 Z M 80.987392 51.61287 C 82.209382 50.390874 84.190618 50.390874 85.412608 51.61287 C 86.634604 52.834856 86.634604 54.81609 85.412608 56.038075 C 84.190618 57.26007 82.209382 57.26007 80.987392 56.038075 C 79.765396 54.81609 79.765396 52.834856 80.987392 51.61287 M 80.987392 7.961925 C 82.209382 6.739931 84.190618 6.739931 85.412608 7.961925 C 86.634604 9.183912 86.634604 11.165144 85.412608 12.387132 C 84.190618 13.609126 82.209382 13.609126 80.987392 12.387132 C 79.765396 11.165144 79.765396 9.183912 80.987392 7.961925 M 108.58739 17.955897 C 109.80938 16.733903 111.79061999999999 16.733903 113.01261 17.955897 C 114.23460399999999 19.177885 114.23460399999999 21.159116 113.01261 22.381104 C 111.79061999999999 23.603098 109.80938 23.603098 108.58739 22.381104 C 107.365396 21.159116 107.365396 19.177885 108.58739 17.955897 M 80.2 45.42739 C 78.993649 45.857395 77.861406 46.5553 76.895611 47.521096 C 73.413774 51.00291 73.413774 56.648036 76.895611 60.12985 C 80.37743 63.61168 86.02257 63.61168 89.504388 60.12985 C 92.986225 56.648036 92.986225 51.00291 89.504388 47.521096 C 88.571439 46.588143 87.48317 45.905174 86.322817 45.47219 L 86.35163800000001 42.302544 L 88.2 42.4 C 88.2 42.4 92.85648 42.705223 96.20304 42.549193 C 102.46873 42.25706 106.98172 41.309813 109.53014999999999 39.125446 C 112.62365 36.47387 113.92451 33.411835 114.10638 29.295624 L 114.144376 28.43571 C 115.22163 28.000484 116.23106 27.346207 117.10439 26.472876 C 120.58622600000001 22.991065 120.58622600000001 17.345937 117.10439 13.864125 C 113.62257 10.382295 107.97743 10.382295 104.49561 13.864125 C 101.01377500000001 17.345937 101.01377500000001 22.991065 104.49561 26.472876 C 105.548445 27.525713 106.79908 28.260192 108.12789000000001 28.676315 L 108.11223 29.030775 C 107.99933 31.585943 107.36516499999999 33.07868 105.6254 34.569906 C 104.459215 35.569493 100.856304 36.32572 95.9236 36.555704 C 92.81067 36.70084 89.450278 36.644723 86.204986 36.46231 C 86.203322 36.462216 86.201658 36.462123 86.199994 36.46203 C 86.2 35.330257 86.2 33.94234 86.2 32 C 86.2 25.195285 86.2 25.195285 86.2 19.17452 L 86.2 18.572612 C 87.40635 18.142605 88.538594 17.444702 89.504388 16.478904 C 92.986225 12.997092 92.986225 7.351964 89.504388 3.8701525 C 86.02257 .38832283 80.37743 .38832283 76.895611 3.8701525 C 73.413774 7.351964 73.413774 12.997092 76.895611 16.478904 C 77.861406 17.444702 78.993649 18.142605 80.2 18.572612 L 80.2 19.17452 C 80.2 25.195285 80.2 25.195285 80.2 32 C 80.2 38.804715 80.2 38.804715 80.2 44.82548 Z'
+			viewbox: (0@0 extent: 128@64));
+		background: Color black ] asStencil
+]
+
 { #category : #icons }
 BrGlamorousVectorIcons class >> largeRustLogo [
 	<script: 'self largeRustLogo inspect'>
@@ -643,6 +655,11 @@ BrGlamorousVectorIcons class >> play [
 		background: Color black ] asStencil
 ]
 
+{ #category : #icons }
+BrGlamorousVectorIcons class >> playAsynchronous [
+	^ [ self largePlayAsynchronous asElement asScalableElement size: 16 @ 16 ] asStencil
+]
+
 { #category : #icons }
 BrGlamorousVectorIcons class >> playground [
 	<script: 'self playground inspect'>
diff --git a/src/Brick/BrEditor.class.st b/src/Brick/BrEditor.class.st
@@ -36,19 +36,12 @@ BrEditor >> beReadOnlyWithoutSelection [
 
 { #category : #accessing }
 BrEditor >> computeVerticalScrollExtent [
-	^ (self layout
-		findFirstVisibleChildClosestToEndCompletelyVisible: true
-		acceptPartiallyVisible: true) segment textEnd
-		- (self layout
-				findFirstVisibleChildClosestToStartCompletelyVisible: true
-				acceptPartiallyVisible: true) segment textStart
+	^ self lastVisibleSegment textEnd - self firstVisibleSegment textStart
 ]
 
 { #category : #accessing }
 BrEditor >> computeVerticalScrollOffset [
-	^ (self layout
-		findFirstVisibleChildClosestToStartCompletelyVisible: true
-		acceptPartiallyVisible: true) segment textStart
+	^ self firstVisibleSegment textStart
 ]
 
 { #category : #accessing }
@@ -101,6 +94,13 @@ BrEditor >> editor: aBrTextEditor [
 	aBrTextEditor consumeClickEvent: false
 ]
 
+{ #category : #accessing }
+BrEditor >> firstVisibleSegment [
+	^ (self layout
+		findFirstVisibleChildClosestToStartCompletelyVisible: true
+		acceptPartiallyVisible: true) segment
+]
+
 { #category : #initialization }
 BrEditor >> initialize [
 	super initialize.
@@ -120,6 +120,7 @@ BrEditor >> initialize [
 	
 	self when: BlMouseUpEvent do: [ :anEvent | anEvent consumed: true ].
 	self when: BlClickEvent do: [ :anEvent | anEvent consumed: true ].
+	self when: BrScrollByWish do: [:aWish | self onScrollBy: aWish]
 ]
 
 { #category : #'api - editor' }
@@ -148,13 +149,30 @@ BrEditor >> isReadOnly [
 	^ self viewModel mode isReadOnly
 ]
 
+{ #category : #accessing }
+BrEditor >> lastVisibleSegment [
+	^ (self layout
+		findFirstVisibleChildClosestToEndCompletelyVisible: true
+		acceptPartiallyVisible: true) segment
+]
+
 { #category : #'editor - operations' }
 BrEditor >> navigator [
 	<return: #BrTextEditorNavigator>
 
 	^ self editor navigator
 ]
 
+{ #category : #'api - scrolling' }
+BrEditor >> onScrollBy: aWish [
+	| position linesOnScreen |
+	position := aWish delta y asInteger.
+	linesOnScreen := self lastVisibleSegment index - self firstVisibleSegment index.
+	position > self computeVerticalScrollExtent
+		ifTrue: [ self scrollToPosition: self lastVisibleSegment index + linesOnScreen ]
+		ifFalse: [ self scrollToPosition: self firstVisibleSegment index - linesOnScreen ]
+]
+
 { #category : #'editor - operations' }
 BrEditor >> selecter [
 	<return: #BrTextEditorSelecter>
