Differential D21815 Diff 60379 sddm-theme/SessionButton.qml

Changeset View

Standalone View

sddm-theme/SessionButton.qml

Show All 11 Lines
12	* GNU General Public License for more details	12		* GNU General Public License for more details
13	*	13		*
14	* You should have received a copy of the GNU Library General Public	14		* You should have received a copy of the GNU Library General Public
15	* License along with this program; if not, write to the	15		* License along with this program; if not, write to the
16	* Free Software Foundation, Inc.,	16		* Free Software Foundation, Inc.,
17	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	17		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
18	*/	18		*/
19		19
20	import QtQuick 2.2	20		import QtQuick 2.6
21		21
22	import org.kde.plasma.core 2.0 as PlasmaCore	22		import org.kde.plasma.core 2.0 as PlasmaCore
23	import org.kde.plasma.components 2.0 as PlasmaComponents	23		import org.kde.plasma.components 3.0 as PlasmaComponents
			davidedmundsonUnsubmitted Not Done Note that (confusingly) Plasma components 2 is QQC1 Plasma components3 is QQC2 It might fix the menu issue davidedmundson: Note that (confusingly) Plasma components 2 is QQC1 Plasma components3 is QQC2 It might fix…
			cblackAuthorUnsubmitted Not Done The `menu` property seems to be removed in PC3 cblack: The `menu` property seems to be removed in PC3
			cblackAuthorUnsubmitted Not Done Additionally, `ToolButton` still seems to use QQC1 even in PC3. cblack: Additionally, [[ https://api.kde.org/frameworks/plasma…
24		24
25	import QtQuick.Controls 1.3 as QQC	25		import QtQuick.Controls 2.5 as QQC2
		26		import QtGraphicalEffects 1.0
26		27
27	PlasmaComponents.ToolButton {	28		PlasmaComponents.ToolButton {
			davidedmundsonUnsubmitted Not Done Why the wrapper? davidedmundson: Why the wrapper?
			cblackAuthorUnsubmitted Not Done QML files can only have one root, and the ToolButton's `menu` property doesn't accept QQC2 menus, meaning they have to be separated. cblack: QML files can only have one root, and the ToolButton's `menu` property doesn't accept QQC2…
			filipfUnsubmitted Not Done It seems to be running fine without the Item wrapper for me. What I did though was but the QQC2 menu inside the button, I didn't split them up. filipf: It seems to be running fine without the Item wrapper for me. What I did though was but the QQC2…
28	id: root	29		id: sessionButton
29	property int currentIndex: -1	30		property int currentIndex: -1
			davidedmundsonUnsubmitted Not Done Implicit height should be propagated upwards, not height. davidedmundson: Implicit height should be propagated upwards, not height.
			davidedmundsonUnsubmitted Not Done I meant implicitWidth: toolBtn.implicitWidth width by default is bound to the implicitWidth so you don't need to set it but more importantly you still have the data of the size something wants to be after someone else (a layout) sets the size davidedmundson: I meant implicitWidth: toolBtn.implicitWidth width by default is bound to the implicitWidth…
30		31
31	implicitWidth: minimumWidth	32		visible: sessionMenu.count > 1
32		33
33	visible: menu.items.length > 1	34		text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).name \|\| "Error")
34
35	text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text \|\| "")
36		35
37	font.pointSize: config.fontSize	36		font.pointSize: config.fontSize
38		37
39	Component.onCompleted: {	38		Component.onCompleted: {
40	currentIndex = sessionModel.lastIndex	39		currentIndex = sessionModel.lastIndex
41	}	40		}
42		41
43	menu: QQC.Menu {	42		onClicked: {
44	id: menu	43		sessionMenu.popup(x, y)
45	style: BreezeMenuStyle {}	44		}
			filipfUnsubmitted Not Done While we're doing this, can you perhaps make the menu pop up above the button? filipf: While we're doing this, can you perhaps make the menu pop up above the button?
			cblackAuthorUnsubmitted Not Done It seems that changing the `y` value doesn't affect its y position for whatever reason. cblack: It seems that changing the `y` value doesn't affect its y position for whatever reason.
		45
		46		QQC2.Menu {
		47		id: sessionMenu
		48
		49		property int largestWidth: 9999
		50
		51		Component.onCompleted: {
		52		var trueWidth = 0;
		53		for (var i = 0; i < sessionMenu.count; i++) {
		54		trueWidth = Math.max(trueWidth, sessionMenu.itemAt(i).textWidth)
		55		}
		56		sessionMenu.largestWidth = trueWidth
		57		}
			filipfUnsubmitted Not Done This can be up for debate, but I sort of liked the older behavior more when the menu's width would be determined by the size of the ToolButton at a particular point. filipf: This can be up for debate, but I sort of liked the older behavior more when the menu's width…
		58
		59		background: Rectangle {
		60		implicitHeight: 40
		61		implicitWidth: sessionMenu.largestWidth > sessionButton.implicitWidth ? sessionMenu.largestWidth : sessionButton.implicitWidth
		62		color: PlasmaCore.ColorScope.backgroundColor
		63		property color borderColor: PlasmaCore.Colorscope.textColor
		64		border.color: Qt.rgba(borderColor.r, borderColor.g, borderColor.b, 0.3)
		65		border.width: 1
		66		layer.enabled: true
		67		layer.effect: DropShadow {
		68		transparentBorder: true
		69		radius: 8
		70		samples: 8
		71		horizontalOffset: 0
		72		verticalOffset: 2
		73		color: Qt.rgba(0, 0, 0, 0.3)
		74		}
		75		}
		76
46	Instantiator {	77		Instantiator {
47	id: instantiator	78		id: instantiator
48	model: sessionModel	79		model: sessionModel
49	onObjectAdded: menu.insertItem(index, object)	80		onObjectAdded: sessionMenu.addItem( object )
50	onObjectRemoved: menu.removeItem( object )	81		onObjectRemoved: sessionMenu.removeItem( object )
51	delegate: QQC.MenuItem {	82		delegate: QQC2.MenuItem {
		83		id: menuItem
		84		property string name: model.name
		85
		86		property real textWidth: text.contentWidth + 20
		87		implicitWidth: text.contentWidth + 20
		88		implicitHeight: Math.round(text.contentHeight * 1.6)
		89
		90		contentItem: QQC2.Label {
		91		id: text
52	text: model.name	92		text: model.name
53	onTriggered: {	93		color: PlasmaCore.ColorScope.textColor
			filipfUnsubmitted Not Done Why do we need to set this? filipf: Why do we need to set this?
54	root.currentIndex = model.index	94		horizontalAlignment: Text.AlignLeft
		95		verticalAlignment: Text.AlignVCenter
		96		elide: Text.ElideRight
		97		}
		98
		99		background: Rectangle {
		100		border.color: PlasmaCore.ColorScope.highlightColor
		101		border.width: 1
		102		color: Qt.rgba(PlasmaCore.ColorScope.highlightColor.r,PlasmaCore.ColorScope.highlightColor.g,PlasmaCore.ColorScope.highlightColor.b,0.3)
		103		opacity: menuItem.highlighted ? 1 : 0
		104		radius: 2
		105		MouseArea {
		106		anchors.fill: parent
		107		hoverEnabled: true
		108		onContainsMouseChanged: menuItem.highlighted = containsMouse
		109		onClicked: {
		110		sessionMenu.dismiss()
		111		sessionButton.currentIndex = model.index
		112		}
		113		}
		114		}
		115		}
		116		}
		117
		118		enter: Transition {
		119		NumberAnimation {
		120		property: "opacity"
		121		from: 0
		122		to: 1
		123		duration: 150
		124		}
55	}	125		}
		126		exit: Transition {
		127		NumberAnimation {
		128		property: "opacity"
		129		from: 1
		130		to: 0
		131		duration: 150
56	}	132		}
57	}	133		}
58	}	134		}
59	}	135		}