From 2f6929cc70071f06e45121d2b615889c74d013cb Mon Sep 17 00:00:00 2001
From: floralrainfall <waternewgatchi@gmail.com>
Date: Mon, 10 Jul 2023 02:33:24 -0400
Subject: [PATCH] fix resize

---
 Projects/Client/Common/Source/GL/Widget.cpp  |  2 +-
 Projects/Client/Studio/Header/MainWindow.hpp |  7 ++++
 Projects/Client/Studio/Source/MainWindow.cpp | 36 ++++++++++++++++----
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/Projects/Client/Common/Source/GL/Widget.cpp b/Projects/Client/Common/Source/GL/Widget.cpp
index 5485385..4742c44 100644
--- a/Projects/Client/Common/Source/GL/Widget.cpp
+++ b/Projects/Client/Common/Source/GL/Widget.cpp
@@ -91,7 +91,7 @@ namespace GL
     Ogre::String Widget::getWindowHandle()
     {
         Ogre::String windowHandle;
-        windowHandle = Ogre::StringConverter::toString((unsigned long)window()->winId());
+        windowHandle = Ogre::StringConverter::toString((unsigned long)winId());
         printf("Widget::getWindowHandle(): %s\n", windowHandle.c_str());
         return windowHandle;
     }
diff --git a/Projects/Client/Studio/Header/MainWindow.hpp b/Projects/Client/Studio/Header/MainWindow.hpp
index 82faa98..03db318 100644
--- a/Projects/Client/Studio/Header/MainWindow.hpp
+++ b/Projects/Client/Studio/Header/MainWindow.hpp
@@ -3,6 +3,8 @@
 #include <QMainWindow>
 #include <QTreeWidget>
 #include <QTimer>
+#include <QToolBar>
+#include <QMenuBar>
 
 #include <GL/Widget.hpp>
 
@@ -16,6 +18,11 @@ class MainWindow : public QMainWindow
         Ogre::Root* ogreRoot;
         GL::Widget* widget;
         QTreeWidget* explorer;
+        QToolBar* toolbar;
+        QMenuBar* menubar;
+
+        void createToolbar();
     protected:
         void closeEvent(QCloseEvent* event);
+        void resizeEvent(QResizeEvent* event);
 };
\ No newline at end of file
diff --git a/Projects/Client/Studio/Source/MainWindow.cpp b/Projects/Client/Studio/Source/MainWindow.cpp
index 34d2545..524ef35 100644
--- a/Projects/Client/Studio/Source/MainWindow.cpp
+++ b/Projects/Client/Studio/Source/MainWindow.cpp
@@ -1,7 +1,6 @@
 #include <MainWindow.hpp>
 #include <QGridLayout>
 #include <QTreeView>
-#include <QToolBar>
 
 #include "Resources/StudioResources.hpp"
 
@@ -16,24 +15,47 @@ MainWindow::MainWindow()
     ogreRoot = new Ogre::Root();
     ogreRoot->showConfigDialog(NULL);
     ogreRoot->initialise(false);
-    this->widget = new GL::Widget(ogreRoot);
-    grid->addWidget(this->widget, 0, 0, 1, 2);
-    QTreeView* instance_tree = new QTreeView();
-    grid->addWidget(instance_tree, 0, 2, 1, 1);
     
+    menubar = new QMenuBar();
+    grid->addWidget(menubar, 0, 0, 1, 1);
+
+    toolbar = new QToolBar();
+    grid->addWidget(toolbar, 1, 0, 1, 1);
+
+    createToolbar();
+
+    this->widget = new GL::Widget(ogreRoot);
+    grid->addWidget(this->widget, 2, 0, 1, 2);
+    
+    explorer = new QTreeWidget();
+    grid->addWidget(explorer, 2, 2, 1, 1);
+
     content_widget->setLayout(grid);
 
-    grid->setContentsMargins(0,0,0,0);
+    grid->setContentsMargins(0, 0, 0, 0);
     grid->setSpacing(0);
 
+
     setWindowTitle(QString("RNR Studio"));
     setWindowIcon(QIcon(pixmap));
     setCentralWidget(content_widget);
+}
 
-    QToolBar* tool_bar = new QToolBar(this);
+void MainWindow::createToolbar()
+{
+    QMenu* file_menu = menubar->addMenu("File");
+    QMenu* help_menu = menubar->addMenu("Help");
+    help_menu->addAction("About...");
 }
 
 void MainWindow::closeEvent(QCloseEvent* event)
 {
 
+}
+
+void MainWindow::resizeEvent(QResizeEvent* event)
+{
+    QSize new_size = event->size();
+    explorer->setMaximumWidth(new_size.width()/4);
+
 }
\ No newline at end of file