Use taskbarTask as model for the morph and so re-enable icon in the toolbar

badetitou · badetitou · commit 09f40b6ecb36 · 2024-05-15T21:18:45.000+02:00
diff --git a/src/Morphic-Widgets-Taskbar/TaskbarItemMorph.class.st b/src/Morphic-Widgets-Taskbar/TaskbarItemMorph.class.st
@@ -52,8 +52,8 @@ TaskbarItemMorph >> initialize [
 { #category : 'initialization' }
 TaskbarItemMorph >> initializeAnnouncements [
 	self
-		on: #mouseEnter send: #taskbarButtonEntered:event:in: to: self model withValue: self;
-		on: #mouseLeave send: #taskbarButtonLeft:event:in: to: self model withValue: self
+		on: #mouseEnter send: #taskbarButtonEntered:event:in: to: self model morph withValue: self;
+		on: #mouseLeave send: #taskbarButtonLeft:event:in: to: self model morph withValue: self
 ]
 
 { #category : 'initialization' }
@@ -65,7 +65,7 @@ TaskbarItemMorph >> initializeFor: aTaskbar [
 	lm := self theme
 		newRowIn: aTaskbar
 		for:
-			{((self iconFormSetNamed: self model taskbarIconName) ifNil: [ ^ nil ]) asMorph.
+			{(self model icon ifNil: [ ^ nil ]) asMorph.
 			lab}.
 	lm cellInset: 2.
 	self
@@ -78,14 +78,14 @@ TaskbarItemMorph >> initializeFor: aTaskbar [
 	self initializeAnnouncements.
 	lab
 		color:
-			(self model isCollapsed
+			(self model state = #minimized
 				ifTrue: [ self theme taskbarItemLabelColorForCollapsed: self ]
 				ifFalse: [ self theme taskbarItemLabelColorForExpanded: self ])
 ]
 
 { #category : 'accessing' }
 TaskbarItemMorph >> labelOfSize: labSize [
-	^ self theme	buttonLabelForText: (self model taskbarLabel truncateWithElipsisTo: labSize)
+	^ self theme	buttonLabelForText: (self model label truncateWithElipsisTo: labSize)
 ]
 
 { #category : 'accessing' }
@@ -121,6 +121,23 @@ TaskbarItemMorph >> normalFillStyle [
 	^ self theme taskbarItemNormalFillStyleFor: self
 ]
 
+{ #category : 'accessing' }
+TaskbarItemMorph >> performAction: event [
+	"Inform the model that this button has been pressed. Sent by the controller when this button is pressed. If the button's actionSelector takes any arguments, they are obtained dynamically by sending the argumentSelector to the argumentsProvider"
+
+	enabled ifFalse: [ ^ self ].
+	askBeforeChanging ifTrue: [
+		model morph okToChange ifFalse: [ ^ self ] ].
+	self actionBlock ifNotNil: [ ^ self actionBlock cull: event ].
+	actionSelector ifNotNil: [
+		actionSelector numArgs = 0
+			ifTrue: [ model morph perform: actionSelector ]
+			ifFalse: [
+				argumentsProvider ifNotNil: [
+					arguments := argumentsProvider perform: argumentsSelector ].
+				model morph perform: actionSelector withArguments: arguments ] ]
+]
+
 { #category : 'style - border' }
 TaskbarItemMorph >> pressedBorderStyle [
 	"Return the pressed borderStyle of the receiver."
diff --git a/src/Morphic-Widgets-Taskbar/TaskbarTask.class.st b/src/Morphic-Widgets-Taskbar/TaskbarTask.class.st
@@ -144,7 +144,7 @@ TaskbarTask >> taskListButtonFor: aTasklist [
 TaskbarTask >> taskbarButtonFor: aTaskBar [
 	"Answer a button for the task."
 
-	^self morph taskbarButtonFor: aTaskBar
+	^ aTaskBar theme newTaskbarButtonIn: aTaskBar forTask: self
 ]
 
 { #category : 'accessing' }
diff --git a/src/Polymorph-Widgets/Object.extension.st b/src/Polymorph-Widgets/Object.extension.st
@@ -42,17 +42,17 @@ Object >> systemIconName [
 ]
 
 { #category : '*Polymorph-Widgets' }
-Object >> taskbarLabel [
+Object class >> taskbarLabel [
 	"Answer the label string for the receiver in a task bar
 	or nil for the default."
 
-	^self class taskbarLabel
+	^nil
 ]
 
 { #category : '*Polymorph-Widgets' }
-Object class >> taskbarLabel [
+Object >> taskbarLabel [
 	"Answer the label string for the receiver in a task bar
 	or nil for the default."
 
-	^nil
+	^self class taskbarLabel
 ]
diff --git a/src/Polymorph-Widgets/UITheme.class.st b/src/Polymorph-Widgets/UITheme.class.st
@@ -3406,6 +3406,18 @@ UITheme >> newTaskbarButtonIn: aTaskbar for: aWindow [
 		yourself
 ]
 
+{ #category : 'morph creation' }
+UITheme >> newTaskbarButtonIn: aTaskbar forTask: aTaskbarTask [
+	"Answer a taskbar button morph for the given window."
+
+	^ (TaskbarItemMorph
+		   on: aTaskbarTask
+		   getState: #isActive
+		   action: #taskbarButtonClicked)
+		  initializeFor: aTaskbar;
+		  yourself
+]
+
 { #category : 'morph creation' }
 UITheme >> newTaskbarThumbnailIn: aThemedMorph for: aWindow [
 	"Answer a taskbar thumbnail morph for the given window."

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ TaskbarTask >> taskListButtonFor: aTasklist [`
`144`	`144`	`TaskbarTask >> taskbarButtonFor: aTaskBar [`
`145`	`145`	`"Answer a button for the task."`
`146`	`146`
`147`		`- ^self morph taskbarButtonFor: aTaskBar`
	`147`	`+ ^ aTaskBar theme newTaskbarButtonIn: aTaskBar forTask: self`
`148`	`148`	`]`
`149`	`149`
`150`	`150`	`{ #category : 'accessing' }`
Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,17 @@ Object >> systemIconName [`
`42`	`42`	`]`
`43`	`43`
`44`	`44`	`{ #category : '*Polymorph-Widgets' }`
`45`		`-Object >> taskbarLabel [`
	`45`	`+Object class >> taskbarLabel [`
`46`	`46`	`"Answer the label string for the receiver in a task bar`
`47`	`47`	`or nil for the default."`
`48`	`48`
`49`		`- ^self class taskbarLabel`
	`49`	`+ ^nil`
`50`	`50`	`]`
`51`	`51`
`52`	`52`	`{ #category : '*Polymorph-Widgets' }`
`53`		`-Object class >> taskbarLabel [`
	`53`	`+Object >> taskbarLabel [`
`54`	`54`	`"Answer the label string for the receiver in a task bar`
`55`	`55`	`or nil for the default."`
`56`	`56`
`57`		`- ^nil`
	`57`	`+ ^self class taskbarLabel`
`58`	`58`	`]`