Commit 90493bf3 authored by Christoffer Ackelman's avatar Christoffer Ackelman

QT: Fixed closing GE subgraphs.

parent 24c20f39
......@@ -1261,8 +1261,8 @@ void GeQtWidget::focusInEvent(QFocusEvent* event)
GeQt::~GeQt()
{
if (subgraphs_widget) {
subgraphs_widget->close();
if (subgraphs) {
delete subgraphs;
}
delete subpalette;
delete recall_entry;
......
......@@ -45,6 +45,7 @@
#include "ge_attr_qt.h"
#include "ge_subgraphs_qt.h"
#include <QCloseEvent>
#include <QMenuBar>
#include <QTimer>
#include <QVBoxLayout>
......@@ -57,7 +58,7 @@ void SubGraphsQtWidget::closeEvent(QCloseEvent* event)
trace_timerid->stop();
delete subgraphs;
}
QWidget::closeEvent(event);
event->ignore();
}
void SubGraphsQtWidget::focusInEvent(QFocusEvent* event)
......@@ -119,7 +120,6 @@ SubGraphsQt::SubGraphsQt(void* xn_parent_ctx, const char* xn_name,
toplevel = new SubGraphsQtWidget(this);
toplevel->setMinimumSize(300, 500);
toplevel->setWindowTitle(fl(name));
toplevel->setAttribute(Qt::WA_DeleteOnClose);
// Menu
QMenuBar* menu_bar = new QMenuBar(toplevel);
......@@ -171,6 +171,8 @@ SubGraphsQt::~SubGraphsQt()
}
delete brow;
delete toplevel;
}
void SubGraphsQt::trace_start()
......@@ -201,4 +203,4 @@ void SubGraphsQtWidget::trace_scan()
Attr* SubGraphsQt::new_attr(void* object, attr_sItem* items, int num)
{
return new AttrQt(toplevel, this, attr_eType_Attributes, object, items, num);
}
\ No newline at end of file
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment