From: mnt <mnt@opencascade.com>
Date: Thu, 10 May 2018 08:22:35 +0000 (+0300)
Subject: 0023552: Unable to use the contextual menu of Object Browser window
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=00fd0ed41018ddf2cbb9d6bb0d4f6619889fc9e4;p=modules%2Fgui.git

0023552: Unable to use the contextual menu of Object Browser window
- Attempt 2: re-implement simplifySeparators() function
---

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index 0fe626c72..61d36d7c4 100755
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -276,34 +276,53 @@ void Qtx::simplifySeparators( QWidget* wid, const bool recursive )
   if ( !wid )
     return;
 
-  QList<QAction*> items = wid->actions();
-  if ( items.isEmpty() )
-    return;
-
-  bool action = false;
-  for ( int i = 0; i < items.count(); i++ )
+  if ( wid->inherits( "QMenu") || wid->inherits( "QMenuBar") )
   {
-    QAction* a = items[i];
-    if ( a->isSeparator() ) {
-      a->setVisible(action);
-      action = false;
-    }
-    else if ( a->isVisible() ) {
-      action = true;
-      if ( recursive && a->menu() )
-	simplifySeparators( a->menu(), recursive );
+    if ( qobject_cast<QMenu*>( wid ) )
+      qobject_cast<QMenu*>( wid )->setSeparatorsCollapsible( true );
+    if ( recursive )
+    {
+      foreach ( QAction* action, wid->actions() )
+      {
+	if ( action->menu() )
+	  simplifySeparators( action->menu(), recursive );
+      }
     }
   }
+  else
+  {
+    QList<QAction*> actions = wid->actions();
+    if ( actions.isEmpty() )
+      return;
 
-  action = false;
-  for ( int i = items.count() - 1; i > 0; i-- ) {
-    QAction* a = items[i];
-    if ( a->isSeparator() ) {
-      a->setVisible(action);
-      action = false;
+    bool is_action = false;
+    for ( int i = 0; i < actions.count(); i++ )
+    {
+      QAction* action = actions[i];
+      if ( action->isSeparator() )
+      {
+	action->setVisible( is_action );
+	is_action = false;
+      }
+      else if ( action->isVisible() )
+      {
+	is_action = true;
+      }
+    }
+    is_action = false;
+    for ( int i = actions.count() - 1; i > 0; i-- )
+    {
+      QAction* action = actions[i];
+      if ( action->isSeparator() )
+      {
+	action->setVisible( is_action );
+	is_action = false;
+      }
+      else if ( action->isVisible() )
+      {
+	is_action = true;
+      }
     }
-    else if ( a->isVisible() )
-      action = true;
   }
 }