Bug fix: Empty toolbars not hided automaticaly. Modified function: updateVisibility()

diff --git a/src/Qtx/QtxDockWindow.cxx b/src/Qtx/QtxDockWindow.cxx
index e87e07a110bdcfc131655927e9ea2088bb42f016..1fc289fe7b88c47a3634fb6a594a999e381f38b3 100644 (file)
--- a/src/Qtx/QtxDockWindow.cxx
+++ b/src/Qtx/QtxDockWindow.cxx
@@ -158,10 +158,10 @@ void QtxDockWindow::Watcher::updateVisibility()
     vis = it.current()->widget() && it.current()->widget()->isVisibleTo( myCont );
 
   QMainWindow* mw = myCont->mainWindow();
-  if ( mw && myEmpty != vis )
+  if ( mw && myEmpty == vis )
   {
-    myEmpty = vis;
-    if ( myEmpty )
+    myEmpty = !vis;
+    if ( !myEmpty )
       mw->setAppropriate( myCont, myState );
     else
     {
@@ -170,7 +170,7 @@ void QtxDockWindow::Watcher::updateVisibility()
     }
   }
 
-  vis = myEmpty && myVisible;
+  vis = !myEmpty && myVisible;
   if ( vis != myCont->isVisibleTo( myCont->parentWidget() ) )
     vis ? showContainer() : hideContainer();
 }

diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index 311f1deb37c9cbfa932bdd55135b7f5bf93032cf..d1b888f10f17f841f7a5aa212988fe5dd407430f 100644 (file)
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.cxx
@@ -180,10 +180,10 @@ void QtxToolBar::Watcher::updateVisibility()
   }
 
   QMainWindow* mw = myCont->mainWindow();
-  if ( mw && myEmpty != vis )
+  if ( mw && myEmpty == vis )
   {
-    myEmpty = vis;
-    if ( myEmpty )
+    myEmpty = !vis;
+    if ( !myEmpty )
       mw->setAppropriate( myCont, myState );
     else
     {
@@ -192,7 +192,7 @@ void QtxToolBar::Watcher::updateVisibility()
     }
   }
 
-  vis = myEmpty && myVisible;
+  vis = !myEmpty && myVisible;
   if ( vis != myCont->isVisibleTo( myCont->parentWidget() ) )
     vis ? showContainer() : hideContainer();
 }