Mercurial > hg > octave-shane

changeset 16818:caf3d2a45da0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up some code for undocking and docking widgets * octave-dock-widget.cc(make_window,makewidget): remove boolean parameter, (change_floating): call make_widget and make_window without parameter * octave-dock-wodget.h(make_window,makewidget): remove boolean parameter * main-window.cc(set_window_layout): call make_widget and make_window without parameter
author Torsten <ttl@justmail.de>
date Sun, 23 Jun 2013 12:07:07 +0200
parents 893e9cec62f1
children 94c19dfb4ab1
files libgui/src/main-window.cc libgui/src/octave-dock-widget.cc libgui/src/octave-dock-widget.h
diffstat 3 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc
+++ b/libgui/src/main-window.cc
@@ -553,7 +553,7 @@
           bool floating = settings->value
               ("DockWidgets/" + name + "Floating", false).toBool ();
           if (floating)
-            widget->make_window (false);
+            widget->make_window ();
           else if (! widget->parent ())  // should not be floating but is
             widget->setParent (this);    // reparent
 
--- a/libgui/src/octave-dock-widget.cc
+++ b/libgui/src/octave-dock-widget.cc
@@ -126,7 +126,7 @@
 
 // make the widget floating
 void
-octave_dock_widget::make_window (bool visible)
+octave_dock_widget::make_window ()
 {
   QSettings *settings = resource_manager::get_settings ();
 
@@ -143,14 +143,11 @@
   // restore the last geometry when floating
   restoreGeometry (settings->value
           ("DockWidgets/" + objectName ()+"_floating_geometry").toByteArray ());
-
-  if (visible)
-    show ();  // make visible if desired
 }
 
 // dock the widget
 void
-octave_dock_widget::make_widget (bool visible)
+octave_dock_widget::make_widget ()
 {
   QSettings *settings = resource_manager::get_settings ();
 
@@ -170,8 +167,6 @@
   // adjust the (un)dock icon
   _dock_action->setIcon (QIcon (":/actions/icons/widget-undock.png"));
   _dock_action->setToolTip (tr ("Unock widget"));
-
-  setVisible (visible);
 }
 
 // slot for (un)dock action
@@ -180,11 +175,11 @@
 {
   if (parent())
     {
-      make_window (true);
+      make_window ();
       focus ();
     }
   else
-    make_widget (true);
+    make_widget ();
 }
 
 // slot for hiding the widget
--- a/libgui/src/octave-dock-widget.h
+++ b/libgui/src/octave-dock-widget.h
@@ -39,8 +39,8 @@
   virtual ~octave_dock_widget ();
 
   virtual void connect_visibility_changed (void);
-  void make_window (bool visible);
-  void make_widget (bool visible);
+  void make_window (void);
+  void make_widget (void);
   void set_title (const QString&);
 
 signals: