On Thursday 21 April 2016 11:38:25 Dirk Hohndel wrote:
> > from my tests on the gallery app it seems at least not to have
> > regressions (hopefully should work a bit better)
> > if from tests looks like it works better, I'll merge it shortly.
> 
> Have you tried building Subsurface-mobile against it? :-)
> 
> That would seem like a somewhat bigger test app that you could play
> with...

tried on the laptop so far, after a few fixes on the branch it seems to work 
fine (not super familiar on all aspects of the app tough)
the only thing, i would then push the little change on the header api that 
caused problems, for which this attached patch would be needed

-- 
Marco Martin
>From 726d67e97ab737614e84b472a4480aa3bb9ee896 Mon Sep 17 00:00:00 2001
From: Marco Martin <notm...@gmail.com>
Date: Fri, 22 Apr 2016 18:12:15 +0200
Subject: [PATCH] Adapt to Kirigami api changes

* add new file AbstractApplicationHeader.qml to the qrc
* use new api for custom ApplicationHeader

header: Kirigami.ApplicationHeader {
	minimumHeight: 0
	preferredHeight: Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1)
	maximumHeight: Kirigami.Units.gridUnit * 2
}

Signed-off-by: Marco Martin <notm...@gmail.com>
---
 mobile-widgets/qml/main.qml             | 8 +++++---
 mobile-widgets/qml/mobile-resources.qrc | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 06e691e..e1a1406 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -12,9 +12,11 @@ Kirigami.ApplicationWindow {
 	id: rootItem
 	title: qsTr("Subsurface-mobile")
 
-	header.minimumHeight: 0
-	header.preferredHeight: Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1)
-	header.maximumHeight: Kirigami.Units.gridUnit * 2
+	header: Kirigami.ApplicationHeader {
+		minimumHeight: 0
+		preferredHeight: Kirigami.Units.gridUnit * (Qt.platform.os == "ios" ? 2 : 1)
+		maximumHeight: Kirigami.Units.gridUnit * 2
+	}
 	property bool fullscreen: true
 	property alias oldStatus: manager.oldStatus
 	property alias accessingCloud: manager.accessingCloud
diff --git a/mobile-widgets/qml/mobile-resources.qrc b/mobile-widgets/qml/mobile-resources.qrc
index 0592c11..e52ccd0 100644
--- a/mobile-widgets/qml/mobile-resources.qrc
+++ b/mobile-widgets/qml/mobile-resources.qrc
@@ -35,6 +35,7 @@
 		<file alias="org/kde/kirigami/Heading.qml">kirigami/Heading.qml</file>
 		<file alias="org/kde/kirigami/OverlaySheet.qml">kirigami/OverlaySheet.qml</file>
 		<file alias="org/kde/kirigami/ApplicationHeader.qml">kirigami/ApplicationHeader.qml</file>
+		<file alias="org/kde/kirigami/AbstractApplicationHeader.qml">kirigami/AbstractApplicationHeader.qml</file>
 		<file alias="org/kde/kirigami/private/PageRow.qml">kirigami/private/PageRow.qml</file>
 		<file alias="org/kde/kirigami/Label.qml">kirigami/Label.qml</file>
 		<file alias="org/kde/kirigami/AbstractListItem.qml">kirigami/AbstractListItem.qml</file>
@@ -48,7 +49,7 @@
 		<file alias="org/kde/kirigami/private/ContextIcon.qml">kirigami/private/ContextIcon.qml</file>
 		<file alias="org/kde/kirigami/private/EdgeShadow.qml">kirigami/private/EdgeShadow.qml</file>
 		<file alias="org/kde/kirigami/private/MenuIcon.qml">kirigami/private/MenuIcon.qml</file>
-		<file alias="org/kde/kirigami/private/PageStack.js">kirigami/private/PageStack.js</file>
+		<file alias="org/kde/kirigami/private/DefaultListItemBackground.qml">kirigami/private/DefaultListItemBackground.qml</file>
 		<file alias="org/kde/kirigami/private/PageActionPropertyGroup.qml">kirigami/private/PageActionPropertyGroup.qml</file>
 		<file alias="org/kde/kirigami/private/PassiveNotification.qml">kirigami/private/PassiveNotification.qml</file>
 		<file alias="org/kde/kirigami/private/RefreshableScrollView.qml">kirigami/private/RefreshableScrollView.qml</file>
-- 
2.1.4

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel

Reply via email to