Add landscape support to process manager

Eeems-Org · Jan 14, 2024 · eb8cfe1 · eb8cfe1
1 parent c13bdfb
commit eb8cfe1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 35 deletions.
diff --git a/applications/process-manager/main.cpp b/applications/process-manager/main.cpp
@@ -9,11 +9,13 @@
 #include <fcntl.h>
 #include <liboxide.h>
 #include <liboxide/eventfilter.h>
+#include <liboxide/oxideqml.h>
 
 #include "controller.h"
 
 using namespace std;
 using namespace Oxide;
+using namespace Oxide::QML;
 using namespace Oxide::Sentry;
 
 int main(int argc, char *argv[]){
@@ -26,9 +28,9 @@ int main(int argc, char *argv[]){
     app.setApplicationDisplayName("Process Monitor");
     app.setApplicationVersion(APP_VERSION);
     QQmlApplicationEngine engine;
+    registerQML(&engine);
     QQmlContext* context = engine.rootContext();
     Controller controller(&engine);
-    context->setContextProperty("screenGeometry", app.primaryScreen()->geometry());
     context->setContextProperty("controller", &controller);
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty()){

diff --git a/applications/process-manager/main.qml b/applications/process-manager/main.qml
@@ -2,13 +2,13 @@ import QtQuick 2.10
 import QtQuick.Window 2.3
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.11
+import "qrc:/codes.eeems.oxide"
 import "widgets"
 
-ApplicationWindow {
+OxideWindow {
     id: window
     visible: true
-    width: screenGeometry.width
-    height: screenGeometry.height
+    backgroundColor: "white"
     onAfterSynchronizing: {
         if (stateController.state == "loading") {
             stateController.state = "loaded";
@@ -21,37 +21,30 @@ ApplicationWindow {
         running: true
         onTriggered: controller.reload()
     }
-
-    menuBar: ColumnLayout {
-        width: parent.width
-        ToolBar {
-            Layout.fillWidth: true
-            background: Rectangle { color: "black" }
-            RowLayout {
-                width: parent.width
-                BetterButton {
-                    text: "⬅️"
-                    onClicked: quitTimer.start()
-                    Timer {
-                        id: quitTimer
-                        interval: 1000
-                        onTriggered: {
-                            controller.breadcrumb("back", "click", "ui");
-                            Qt.quit();
-                        }
-                    }
-                }
-                Item { Layout.fillWidth: true }
-                Label {
-                    text: "Process Manager"
-                    color: "white"
-                    anchors.centerIn: parent
+    leftMenu: [
+        BetterButton {
+            text: "⬅️"
+            onClicked: quitTimer.start()
+            Timer {
+                id: quitTimer
+                interval: 1000
+                onTriggered: {
+                    controller.breadcrumb("back", "click", "ui");
+                    Qt.quit();
                 }
             }
         }
+    ]
+    centerMenu: [
+        Label {
+            text: "Process Manager"
+            color: "white"
+        }
+    ]
+    initialItem: Item{
         RowLayout {
             id: tasksViewHeaderContent
-            Layout.fillWidth: true
+            width: parent.width
             Label {
                 text: "Process"
                 color: "black"
@@ -124,11 +117,9 @@ ApplicationWindow {
             }
             Item { width: scrollbar.width }
         }
-    }
-    background: Rectangle { color: "white" }
-    contentData: [
         ColumnLayout {
             anchors.fill: parent
+            anchors.topMargin: tasksViewHeaderContent.height
             BetterButton {
                 text: "▲"
                 visible: !tasksView.atYBeginning
@@ -336,8 +327,8 @@ ApplicationWindow {
                 }
             }
         }
-    ]
-    footer: ToolBar {
+    }
+    page.footer: ToolBar {
         background: Rectangle { color: "black" }
     }
     StateGroup {