Dont make renderwidget part of uic
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
#include <QMessageBox>
|
||||
#include <MainWindow.hpp>
|
||||
|
||||
MainWindowController::MainWindowController() noexcept {
|
||||
MainWindowController::MainWindowController() noexcept : vulkanWidget(new RenderWidget(this)) {
|
||||
view.setupUi(this);
|
||||
ConnectSignalsToSlots();
|
||||
}
|
||||
@@ -17,7 +17,7 @@ void MainWindowController::ConnectSignalsToSlots() noexcept {
|
||||
view.actionStop->setEnabled(true);
|
||||
emit OpenROM(file_name);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
connect(view.actionExit, &QAction::triggered, this, [this]() {
|
||||
emit Exit();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
#include "ui_mainwindow.h"
|
||||
#include <RenderWidget.hpp>
|
||||
#include <QMainWindow>
|
||||
#include <QApplication>
|
||||
|
||||
@@ -14,6 +15,7 @@ private:
|
||||
void ConnectSignalsToSlots() noexcept;
|
||||
|
||||
Ui::MainWindow view;
|
||||
RenderWidget *vulkanWidget;
|
||||
bool textPauseToggle = false;
|
||||
|
||||
Q_SIGNALS:
|
||||
|
||||
@@ -54,6 +54,7 @@ public:
|
||||
}
|
||||
|
||||
VkSurfaceKHR create_surface(VkInstance instance, VkPhysicalDevice) override {
|
||||
window->show();
|
||||
return QVulkanInstance::surfaceForWindow(window);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,9 +30,6 @@
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="RenderWidget" name="vulkanWidget"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QMenuBar" name="menubar">
|
||||
@@ -122,13 +119,6 @@
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>Renderer</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>RenderWidget.hpp</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
Reference in New Issue
Block a user