feat: window color indicator on timer window + adding some tests

Author: nicolasp025

DebuggingSpy-Browser-Tests/DSRecordBrowserPresenterTest.class.st

@@ -219,10 +219,10 @@ DSRecordBrowserPresenterTest >> testGetWindowColorFrom [
 
 	| record |
 	record := DSWindowRecord new toolInfo: (DSToolInfo new toolClass: StDebugger).
-	self assert: (browser getWindowColorFrom: record) equals: DSWindowRecord debuggerColor.
+	self assert: (browser getWindowColorFrom: record) equals: StDebugger windowColor.
 
 	record toolInfo toolClass: DSRecordBrowserPresenter.
-	self assert: (browser getWindowColorFrom: record) equals: DSWindowRecord defaultColor
+	self assert: (browser getWindowColorFrom: record) equals: DSRecordBrowserPresenter defaultWindowColor
 ]
 
 { #category : 'tests' }

DebuggingSpy-Browser-Tests/DSTimerWindowTest.class.st

@@ -22,6 +22,16 @@ DSTimerWindowTest >> setUp [
 	timerWindow := DSTimerWindow new.
 ]
 
+{ #category : 'tests' }
+DSTimerWindowTest >> testBuildLayout [
+	"buildLayout has been already called from initialize"
+
+	self assert: ({ 'timerMorph'. 'currentTimeMorph'. 'lastEventMorph'. 'windowColorIndicator' } allSatisfy: [ :slotName |
+			 (timerWindow readSlotNamed: slotName) isNotNil ]).
+
+	self assert: timerWindow submorphs size equals: 6
+]
+
 { #category : 'tests' }
 DSTimerWindowTest >> testCurrentTimeMorph [
 
@@ -59,6 +69,17 @@ DSTimerWindowTest >> testGetFormattedNameFrom [
 	self assert: (timerWindow getFormattedNameFrom: DSBrowseRecord new) equals: 'Browse (DSTimerWindowTest)'
 ]
 
+{ #category : 'tests' }
+DSTimerWindowTest >> testGetRecordColorFrom [
+
+	| toolInfo |
+	toolInfo := DSToolInfo new toolClass: StPlayground.
+
+	self assert: (timerWindow getRecordColorFrom: DSAbstractEventRecord new) equals: DSRecordBrowserPresenter defaultWindowColor.
+
+	self assert: (timerWindow getRecordColorFrom: (DSMouseEventRecord new toolInfo: toolInfo)) equals: StPlayground windowColor
+]
+
 { #category : 'tests' }
 DSTimerWindowTest >> testGetToolInfoFor [
 
@@ -104,6 +125,25 @@ DSTimerWindowTest >> testStartTimer [
 	DSSpy recordingSession: false
 ]
 
+{ #category : 'tests' }
+DSTimerWindowTest >> testUpdatePosition [
+
+	| newPosition |
+	newPosition := self currentWorld extent - timerWindow extent - timerWindow margin
+	               - (0 @ self currentWorld taskbars first extent y).
+	
+	timerWindow updatePosition.
+	self assert: timerWindow position equals: newPosition
+]
+
+{ #category : 'tests' }
+DSTimerWindowTest >> testWindowColorIndicator [
+
+	timerWindow writeSlotNamed: 'windowColorIndicator' value: nil.
+	self assert: timerWindow windowColorIndicator isNotNil.
+	self assert: (timerWindow readSlotNamed: 'windowColorIndicator') isNotNil
+]
+
 { #category : 'layout' }
 DSTimerWindowTest >> timerMorph [
 	"Returns the window's timerMorph."

DebuggingSpy-Browser/DSTimerWindow.class.st

@@ -9,7 +9,8 @@ Class {
 		'startTime',
 		'currentTimeMorph',
 		'lastEventMorph',
-		'lastToolInfo'
+		'lastToolInfo',
+		'windowColorIndicator'
 	],
 	#category : 'DebuggingSpy-Browser',
 	#package : 'DebuggingSpy-Browser'
@@ -22,8 +23,10 @@ DSTimerWindow >> buildLayout [
 	timerMorph := self timerMorph.
 	currentTimeMorph := self currentTimeMorph.
 	lastEventMorph := self lastEventMorph.
+	windowColorIndicator := self windowColorIndicator.
 
 	self
+		addMorph: windowColorIndicator;
 		addMorph: lastEventMorph;
 		addMorph: self recordingIcon;
 		addMorph: timerMorph;
@@ -43,7 +46,7 @@ DSTimerWindow >> currentTimeMorph [
 
 	^ StringMorph new
 		  contents: Time now print24;
-		  position: 325 @ 6
+		  position: 335 @ 6
 ]
 
 { #category : 'timer' }
@@ -67,6 +70,17 @@ DSTimerWindow >> getFormattedNameFrom: aRecord [
 	^ formattedEventName
 ]
 
+{ #category : 'accessing' }
+DSTimerWindow >> getRecordColorFrom: aRecord [
+	"Returns the toolInfo's window corresponding color, or default color otherwise."
+
+	| toolInfo |
+	toolInfo := self getToolInfoFor: aRecord.
+	toolInfo ifNil: [ ^ DSRecordBrowserPresenter defaultWindowColor ].
+
+	^ toolInfo toolClass windowColor
+]
+
 { #category : 'accessing' }
 DSTimerWindow >> getToolInfoFor: aRecord [
 	"Returns the record's toolInfo if possible, else returns the last used toolInfo (which can be nil)."
@@ -121,14 +135,18 @@ DSTimerWindow >> lastEventMorph [
 	^ lastEventMorph ifNil: [
 			  lastEventMorph := StringMorph new
 				                    contents: 'No last record';
-				                    position: 5 @ 6 ]
+				                    height: 15;
+				                    position: 15 @ 6 ]
 ]
 
 { #category : 'accessing' }
 DSTimerWindow >> lastRecord: aRecord [
 	"Updates the last record text on the window."
 
-	lastEventMorph contents: (self getFormattedNameFrom: aRecord)
+	lastEventMorph contents: (self getFormattedNameFrom: aRecord).
+	windowColorIndicator
+		backgroundColor: (self getRecordColorFrom: aRecord);
+		contents: '  ' "so we force the redraw"
 ]
 
 { #category : 'accessing' }
@@ -172,14 +190,14 @@ DSTimerWindow >> recordingIcon [
 
 	^ ImageMorph new
 		  image: (self iconNamed: #glamorousRedCircle);
-		  position: 250 @ 7;
+		  position: 260 @ 7;
 		  yourself
 ]
 
 { #category : 'accessing' }
 DSTimerWindow >> size [
 
-	^ 400 @ 30
+	^ 410 @ 30
 ]
 
 { #category : 'accessing' }
@@ -210,7 +228,7 @@ DSTimerWindow >> stopButton [
 		  label: (IconicListItemMorph new icon: (self iconNamed: #stop));
 		  model: self;
 		  actionSelector: #stopTimer;
-		  position: 375 @ 4;
+		  position: 385 @ 4;
 		  yourself
 ]
 
@@ -227,7 +245,7 @@ DSTimerWindow >> timerMorph [
 
 	^ StringMorph new
 		  contents: '00:00:00';
-		  position: 265 @ 6
+		  position: 275 @ 6
 ]
 
 { #category : 'private - layout' }
@@ -236,3 +254,13 @@ DSTimerWindow >> updatePosition [
 
 	self position: self currentWorld extent - self extent - self margin - (0 @ self currentWorld taskbars first extent y)
 ]
+
+{ #category : 'layout' }
+DSTimerWindow >> windowColorIndicator [
+
+	^ windowColorIndicator ifNil: [
+			  windowColorIndicator := StringMorph new
+				                          contents: '  ';
+				                          height: 15;
+				                          position: 5 @ 6 ]
+]