marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reenable the strip

Browse source
This commit is contained in:
Marco Martin 2015-02-25 19:38:34 +01:00
parent 62ff6312db
commit 700f6c2fae
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
containments/homescreen/contents/ui/main.qml
View file

@ -17,6 +17,7 @@
*/ */
import QtQuick 2.1 import QtQuick 2.1
import QtQuick.Layouts 1.1
import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
@ -34,7 +35,7 @@ Item {
property int buttonHeight: width/4 property int buttonHeight: width/4
Containment.onAppletAdded: { Containment.onAppletAdded: {
var container = appletContainerComponent.createObject(appletsSpace) var container = appletContainerComponent.createObject(appletsSpace.layout)
container.visible = true container.visible = true
print("Applet added: " + applet) print("Applet added: " + applet)
applet.parent = container applet.parent = container
@ -49,6 +50,22 @@ Item {
id: appletContainerComponent id: appletContainerComponent
Item { Item {
property Item applet property Item applet
Layout.fillWidth: true
Layout.fillHeight: applet && applet.Layout.fillHeight
Layout.onFillHeightChanged: {
if (plasmoid.formFactor == PlasmaCore.Types.Vertical) {
checkLastSpacer();
}
}
Layout.minimumWidth: root.width
Layout.minimumHeight: applet && applet.Layout.minimumHeight > 0 ? applet.Layout.minimumHeight : root.width
Layout.preferredWidth: root.width
Layout.preferredHeight: applet && applet.Layout.preferredHeight > 0 ? applet.Layout.preferredHeight : root.width
Layout.maximumWidth: root.width
Layout.maximumHeight: applet && applet.Layout.maximumHeight > 0 ? applet.Layout.maximumHeight : (Layout.fillHeight ? root.height : root.width)
} }
} }
@ -68,7 +85,7 @@ Item {
left: parent.left left: parent.left
right: parent.right right: parent.right
} }
z: 1
cellWidth: root.buttonHeight cellWidth: root.buttonHeight
cellHeight: cellWidth cellHeight: cellWidth
model: SatelliteComponents.ApplicationListModel { model: SatelliteComponents.ApplicationListModel {
@ -79,6 +96,7 @@ Item {
delegate: HomeLauncher {} delegate: HomeLauncher {}
header: MouseArea { header: MouseArea {
z: 999 z: 999
property Item layout: mainLayout
width: root.width width: root.width
height: root.height - units.iconSizes.medium height: root.height - units.iconSizes.medium
@ -86,10 +104,14 @@ Item {
containment.action("configure").trigger(); containment.action("configure").trigger();
} }
/*SatelliteStripe { ColumnLayout {
id: mainLayout
anchors.fill: parent
}
SatelliteStripe {
id: stripe id: stripe
z: 99 z: 99
y: Math.max(applications.contentY + parent.height, parent.height - height) y: Math.max(applicationsView.contentY + parent.height, parent.height - height)
PlasmaCore.Svg { PlasmaCore.Svg {
id: stripeIcons id: stripeIcons
@ -133,7 +155,7 @@ Item {
callback: function() { console.log("Start web") } callback: function() { console.log("Start web") }
} }
} }
}*/ }
} }
} }
} }