Differential D25925 Diff 72073 applets/taskmanager/package/contents/ui/AudioStream.qml

Changeset View

Standalone View

applets/taskmanager/package/contents/ui/AudioStream.qml

Context not available.
18	***************************************************************************/	18		***************************************************************************/
19		19
20	import QtQuick 2.0	20		import QtQuick 2.0
		21		import QtGraphicalEffects 1.12
21		22
22	import org.kde.plasma.core 2.0 as PlasmaCore	23		import org.kde.plasma.core 2.0 as PlasmaCore
23		24
Context not available.
36	}	37		}
37	PropertyChanges {	38		PropertyChanges {
38	target: audioStreamIcon	39		target: audioStreamIcon
39	source: "audio-volume-high"	40		elementId: "audio-volume-high"
40	}	41		}
41	},	42		},
42	State {	43		State {
Context not available.
48	}	49		}
49	PropertyChanges {	50		PropertyChanges {
50	target: audioStreamIcon	51		target: audioStreamIcon
51	source: "audio-volume-muted"	52		elementId: "audio-volume-muted"
52	}	53		}
53	}	54		}
54	]	55		]
Context not available.
88	]	89		]
89		90
90	opacity: 0	91		opacity: 0
91	// The indicator should still shown even if the label is hidden,	92		// Do not display the indicator if the icons are too small.
			broulikUnsubmitted Done This breaks displaying the icon on small panels like mine. broulik: This breaks displaying the icon on small panels like mine.
92	// but only if there's enough room for it.	93		visible: opacity > 0 && Math.min(iconBox.width, iconBox.height) >= 16
			heinUnsubmitted Done What's with the magic number 14? hein: What's with the magic number 14?
93	visible: opacity > 0 && (task.width > icon.paintedWidth + audioStreamIconBox.width)
94		94
95	PlasmaCore.IconItem {	95		Glow {
		96		id: audioStreamIconShadow
		97		anchors.fill: audioStreamIcon
		98		visible: audioStreamIcon.state == ""
		99		radius: Math.min(Math.floor(audioStreamIcon.width * 0.17), 2)
		100		samples: radius * 2 + 1
		101		color: theme.backgroundColor
		102		spread: 0.85
		103		source: audioStreamIcon
		104		cached: true
		105		smooth: false
		106		}
		107
		108		PlasmaCore.Svg {
		109		id: audioSvg
		110		imagePath: "icons/audio"
		111		}
		112
		113		PlasmaCore.SvgItem {
			heinUnsubmitted Done Introducing a glow is a pretty big design change, and it's also very expensive rendering-wise. This isn't covered by the merge request description, what's the motivation here? hein: Introducing a glow is a pretty big design change, and it's also very expensive rendering-wise.
			ngrahamUnsubmitted Done I requested this to improve the display with an IOTM. Until this patch, display of the audio indicator was so buggy that I never saw it and never noticed the visual issues with having it overlap an icon like an emblem. I think it's a logical enough part of making the display work properly, but we could easily do this in a follow-up patch if you prefer. ngraham: I requested this to improve the display with an IOTM. Until this patch, display of the audio…
96	id: audioStreamIcon	114		id: audioStreamIcon
97	anchors.fill: parent	115		svg: audioSvg
		116		smooth: false
		117
		118		height: Math.round(Math.min(parent.height * 1.3, units.iconSizes.smallMedium) / 2) * 2
		119		width: height
		120
		121		anchors {
		122		verticalCenter: parent.verticalCenter
		123		right: parent.right
		124		// Avoid overlap to the right.
		125		rightMargin: (parent.width - width) / 2 + units.smallSpacing / 4
		126		}
		127
		128		states: [
		129		State {
		130		name: "horizontal"
		131		// When there is enough space for the audio icon, to fit right of the centered task icon.
		132		when: (frame.width > Math.min(iconBox.width, iconBox.height) +
		133		Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium) * 2)
		134
		135		AnchorChanges {
		136		target: audioStreamIconLoader
		137
		138		anchors.top: undefined
		139		anchors.verticalCenter: frame.verticalCenter
		140		}
		141
		142		PropertyChanges {
		143		target: audioStreamIconLoader
		144
		145		anchors.rightMargin: iconBox.adjustMargin(true, parent.width, taskFrame.margins.right)
		146		width: units.roundToIconSize(Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium))
		147		}
		148
		149		PropertyChanges {
		150		target: audioStreamIcon
		151
		152		height: parent.height
		153		width: parent.width
		154		}
		155		},
		156
		157		State {
		158		name: "vertical"
		159		// When audio icon can fit above the centered task icon.
		160		when: (frame.height > Math.min(iconBox.width, iconBox.height) +
		161		Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium) * 2)
		162
		163		AnchorChanges {
		164		target: audioStreamIconLoader
		165
		166		anchors.right: undefined
		167		anchors.horizontalCenter: frame.horizontalCenter
		168		}
		169
		170		PropertyChanges {
		171		target: audioStreamIconLoader
		172
		173		anchors.topMargin: iconBox.adjustMargin(false, frame.height, taskFrame.margins.top)
		174		width: units.roundToIconSize(Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium))
		175		}
		176
		177		PropertyChanges {
		178		target: audioStreamIcon
		179
		180		height: parent.height
		181		width: parent.width
		182		}
		183		}
		184		]
98	}	185		}
99		186
100	MouseArea {	187		MouseArea {
Context not available.