Mercurial > octave

changeset 25623:331f46b9ee6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix close events of some main dock widgets (bug #54185) * file-editor.cc (closeEvent): call octave_dock_widget::closeEvent if the event is accepted * workspace-view.cc/h (closeEvent): remove obsolete event handler, because all commands of this handler are executed in octave_dock_widget::closeEvent
author Torsten <mttl@mailbox.org>
date Sun, 15 Jul 2018 15:47:49 +0200
parents a7ee69d23f32
children 815cfd72ddf5
files libgui/src/m-editor/file-editor.cc libgui/src/workspace-view.cc libgui/src/workspace-view.h
diffstat 3 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc	Sun Jul 15 11:56:04 2018 +0200
+++ b/libgui/src/m-editor/file-editor.cc	Sun Jul 15 15:47:49 2018 +0200
@@ -1482,10 +1482,15 @@
             e->accept ();
           }
         else
-          e->ignore ();
+          {
+            e->ignore ();
+            return;
+          }
       }
     else
       e->accept ();
+
+    octave_dock_widget::closeEvent (e);
   }
 
   void file_editor::dragEnterEvent (QDragEnterEvent *e)
--- a/libgui/src/workspace-view.cc	Sun Jul 15 11:56:04 2018 +0200
+++ b/libgui/src/workspace-view.cc	Sun Jul 15 15:47:49 2018 +0200
@@ -256,13 +256,6 @@
   }
 
   void
-  workspace_view::closeEvent (QCloseEvent *e)
-  {
-    emit active_changed (false);
-    QDockWidget::closeEvent (e);
-  }
-
-  void
   workspace_view::filter_update (const QString& expression)
   {
     m_filter_model.setFilterWildcard (expression);
--- a/libgui/src/workspace-view.h	Sun Jul 15 11:56:04 2018 +0200
+++ b/libgui/src/workspace-view.h	Sun Jul 15 15:47:49 2018 +0200
@@ -67,10 +67,6 @@
 
     void edit_variable_signal (const QString&, const octave_value&);
 
-  protected:
-
-    void closeEvent (QCloseEvent *event);
-
   protected slots:
 
     void filter_update (const QString& expression);