Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
2c95738b
Commit
2c95738b
authored
4 years ago
by
Christoffer Ackelman
Committed by
Esteban Blanc
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT: Fixed PLC editor closing when the user clicked cancel in the confirm box.
parent
64f06da2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
wb/lib/wb/qt/wb_foe_qt.cqt
wb/lib/wb/qt/wb_foe_qt.cqt
+3
-3
No files found.
wb/lib/wb/qt/wb_foe_qt.cqt
View file @
2c95738b
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
#include "wb_watt_qt.h"
#include "wb_watt_qt.h"
#include "wb_watttext_qt.h"
#include "wb_watttext_qt.h"
#include <QCloseEvent>
#include <QHBoxLayout>
#include <QHBoxLayout>
#include <QMenu>
#include <QMenu>
#include <QMenuBar>
#include <QMenuBar>
...
@@ -578,7 +579,7 @@ void WFoeQt::destroy()
...
@@ -578,7 +579,7 @@ void WFoeQt::destroy()
delete navctx;
delete navctx;
/* Destroy the widget */
/* Destroy the widget */
toplevel->close()
;
delete toplevel
;
// Yes, this is intentional, we want to call the destructor here.
// Yes, this is intentional, we want to call the destructor here.
delete this;
delete this;
...
@@ -725,7 +726,7 @@ void WFoeQt::pop()
...
@@ -725,7 +726,7 @@ void WFoeQt::pop()
void WFoeQtWidget::closeEvent(QCloseEvent* event)
void WFoeQtWidget::closeEvent(QCloseEvent* event)
{
{
foe->activate_quit();
foe->activate_quit();
QWidget::closeEvent(event
);
event->ignore(
);
}
}
// Create a new foe window
// Create a new foe window
...
@@ -747,7 +748,6 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
...
@@ -747,7 +748,6 @@ pwr_tStatus WFoeQt::create_window(int x_top, int y_top, int width_adb,
pwr_tStatus sts;
pwr_tStatus sts;
toplevel->setMinimumSize(1100, 1000);
toplevel->setMinimumSize(1100, 1000);
toplevel->setAttribute(Qt::WA_DeleteOnClose);
CoWowQt::SetWindowIcon(toplevel);
CoWowQt::SetWindowIcon(toplevel);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment