Differential D25925 Diff 72065 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		smooth: false
		105		}
		106
		107		PlasmaCore.Svg {
		108		id: audioSvg
		109		imagePath: "icons/audio"
		110		}
		111
		112		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	113		id: audioStreamIcon
97	anchors.fill: parent	114		svg: audioSvg
		115		smooth: false
		116
		117		height: Math.round(Math.min(parent.height * 1.3, units.iconSizes.smallMedium) / 2) * 2
		118		width: height
		119
		120		anchors {
		121		verticalCenter: parent.verticalCenter
		122		right: parent.right
		123		// Avoid overlap to the right.
		124		rightMargin: (parent.width - width) / 2 + units.smallSpacing / 4
		125		}
		126
		127		states: [
		128		State {
		129		name: "horizontal"
		130		// When there is enough space for the audio icon, to fit right of the centered task icon.
		131		when: (frame.width > Math.min(iconBox.width, iconBox.height) +
		132		Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium) * 2)
		133
		134		AnchorChanges {
		135		target: audioStreamIconLoader
		136
		137		anchors.top: undefined
		138		anchors.verticalCenter: frame.verticalCenter
		139		}
		140
		141		PropertyChanges {
		142		target: audioStreamIconLoader
		143
		144		anchors.rightMargin: iconBox.adjustMargin(true, parent.width, taskFrame.margins.right)
		145		width: units.roundToIconSize(Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium))
		146		}
		147
		148		PropertyChanges {
		149		target: audioStreamIcon
		150
		151		height: parent.height
		152		width: parent.width
		153		}
		154		},
		155
		156		State {
		157		name: "vertical"
		158		// When audio icon can fit above the centered task icon.
		159		when: (frame.height > Math.min(iconBox.width, iconBox.height) +
		160		Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium) * 2)
		161
		162		AnchorChanges {
		163		target: audioStreamIconLoader
		164
		165		anchors.right: undefined
		166		anchors.horizontalCenter: frame.horizontalCenter
		167		}
		168
		169		PropertyChanges {
		170		target: audioStreamIconLoader
		171
		172		anchors.topMargin: iconBox.adjustMargin(false, frame.height, taskFrame.margins.top)
		173		width: units.roundToIconSize(Math.min(Math.min(iconBox.width, iconBox.height), units.iconSizes.smallMedium))
		174		}
		175
		176		PropertyChanges {
		177		target: audioStreamIcon
		178
		179		height: parent.height
		180		width: parent.width
		181		}
		182		}
		183		]
98	}	184		}
99		185
100	MouseArea {	186		MouseArea {
Context not available.