Differential D21815 Diff 59880 sddm-theme/SessionButton.qml

Changeset View

Standalone View

View Options

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​
20import QtQuick 2.2 20​import QtQuick 2.6
21 21​
22import org.kde.plasma.core 2.0 as PlasmaCore 22​import org.kde.plasma.core 2.0 as PlasmaCore
23import org.kde.plasma.components 2.0 as PlasmaComponents 23​import org.kde.plasma.components 2.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​
25import QtQuick.Controls 1.3 as QQC 25​import QtQuick.Controls 2.5 as QQC2
26 26​
27PlasmaComponents.ToolButton { 27​Item {
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 28​ id: root
29​ implicitWidth: width
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​ height: toolBtn.implicitHeight
31​ width: toolBtn.implicitWidth
32​
33​ PlasmaComponents.ToolButton {
34​ id: toolBtn
29 property int currentIndex: -1 35​ property int currentIndex: -1
davidedmundsonUnsubmitted
Not Done

Implicit height should be propagated upwards, not height.

davidedmundson: Implicit height should be propagated upwards, not height.
30 36​
31 implicitWidth: minimumWidth 37​ implicitWidth: minimumWidth
32 38​
33 visible: menu.items.length > 1 39​ visible: sessionMenu.count > 1
34 40​
35 text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text || "") 41​ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).name || "Error")
36 42​
37 font.pointSize: config.fontSize 43​ font.pointSize: config.fontSize
38 44​
39 Component.onCompleted: { 45​ Component.onCompleted: {
40 currentIndex = sessionModel.lastIndex 46​ currentIndex = sessionModel.lastIndex
41 } 47​ }
42 48​
43 menu: QQC.Menu { 49​ onClicked: {
44 id: menu 50​ sessionMenu.popup(x, y)
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 style: BreezeMenuStyle {} 51​ }
52​ }
53​
54​ QQC2.Menu {
55​ id: sessionMenu
56​ property int largestWidth: 9999
57​
58​ Component.onCompleted: {
59​ var trueWidth = 0;
60​ for (var i = 0; i < sessionMenu.count; i++) {
61​ trueWidth = Math.max(trueWidth, sessionMenu.itemAt(i).textWidth)
62​ }
63​ sessionMenu.largestWidth = trueWidth
64​ }
65​
66​ background: Rectangle {
67​ implicitHeight: 40
68​ implicitWidth: sessionMenu.largestWidth
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…
69​ color: PlasmaCore.ColorScope.backgroundColor
70​ border.color: Qt.tint(PlasmaCore.ColorScope.textColor, Qt.rgba(color.r, color.g, color.b, 0.7))
71​ border.width: 1
72​ }
73​
46 Instantiator { 74​ Instantiator {
47 id: instantiator 75​ id: instantiator
48 model: sessionModel 76​ model: sessionModel
49 onObjectAdded: menu.insertItem(index, object) 77​ onObjectAdded: sessionMenu.addItem( object )
50 onObjectRemoved: menu.removeItem( object ) 78​ onObjectRemoved: sessionMenu.removeItem( object )
51 delegate: QQC.MenuItem { 79​ delegate: QQC2.MenuItem {
80​ id: menuItem
81​ property string name: model.name
82​
83​ property real textWidth: text.contentWidth + 20
84​ implicitWidth: text.contentWidth + 20
85​ implicitHeight: text.contentHeight * 1.6
86​
87​ contentItem: QQC2.Label {
88​ id: text
52 text: model.name 89​ text: model.name
53 onTriggered: { 90​ font: menuItem.font
filipfUnsubmitted
Not Done

Why do we need to set this?

filipf: Why do we need to set this?
54 root.currentIndex = model.index 91​ color: PlasmaCore.ColorScope.textColor
92​ horizontalAlignment: Text.AlignLeft
93​ verticalAlignment: Text.AlignVCenter
94​ elide: Text.ElideRight
95​ }
96​
97​ background: Rectangle {
98​ color: menuItem.highlighted ? PlasmaCore.ColorScope.highlightColor : "transparent"
99​ MouseArea {
100​ anchors.fill: parent
101​ hoverEnabled: true
102​ onContainsMouseChanged: menuItem.highlighted = containsMouse
103​ onClicked: {
104​ sessionMenu.dismiss()
105​ toolBtn.currentIndex = model.index
106​ }
107​ }
108​ }
109​ }
110​ }
111​
112​ enter: Transition {
113​ NumberAnimation {
114​ property: "opacity"
115​ from: 0
116​ to: 1
117​ duration: 150
118​ }
55 } 119​ }
120​ exit: Transition {
121​ NumberAnimation {
122​ property: "opacity"
123​ from: 1
124​ to: 0
125​ duration: 150
56 } 126​ }
57 } 127​ }
58 } 128​ }
59} 129​}