Merge branch 'master' into V8_5_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c8c6acf407c18583d8eb0eb8caf95f89e40e05c..f8e1f30df5f8004b837c452a7b76e0338f14a053 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,11 +33,11 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
 
 # Common CMake macros
 # ===================

diff --git a/doc/salome/gui/conf.py.in b/doc/salome/gui/conf.py.in
index ddc1afe6b1783695ff60784c26397f705182abf7..e4c2811567a44b8da0664aa1f9318884172ca46b 100644 (file)
--- a/doc/salome/gui/conf.py.in
+++ b/doc/salome/gui/conf.py.in
@@ -23,9 +23,7 @@ import sys, os
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc',
-               'sphinxcontrib.napoleon'
-]
+extensions = ['sphinx.ext.autodoc']
 #add pdfbuilder to build a pdf with rst2pdf
 #extensions = ['rst2pdf.pdfbuilder']
 

diff --git a/src/Qtx/QtxMenu.cxx b/src/Qtx/QtxMenu.cxx
index a70f1f392f3fa9b8d5c046332441c2b0d3cbfdcd..f3e961d749af51b956e72d50b4358c339fa593f4 100644 (file)
--- a/src/Qtx/QtxMenu.cxx
+++ b/src/Qtx/QtxMenu.cxx
@@ -30,6 +30,7 @@
 #include <QWidgetAction>
 #include <QLinearGradient>
 #include <QAbstractTextDocumentLayout>
+#include <QTimer>
 
 /*!
   \class QtxMenu::Title
@@ -439,3 +440,22 @@ void QtxMenu::updateTitle()
   removeTitle();
   insertTitle();
 }
+
+/*!
+  \brief Paint event
+*/
+void QtxMenu::paintEvent( QPaintEvent* e )
+{
+  // Force menu resizing, see resizeAfterRepaint().
+  QMenu::paintEvent(e);
+  QTimer::singleShot( 0, this, SLOT( resizeAfterRepaint() ) );
+}
+
+void QtxMenu::resizeAfterRepaint()
+{
+  // this slot is used as a workaround about annoying problem
+  // on some X window System desktops like KDE 5, Unity and other
+  // that causes setting incorrect menu's geometry
+  // after it appears on a screen.
+  resize( sizeHint() );
+}

diff --git a/src/Qtx/QtxMenu.h b/src/Qtx/QtxMenu.h
index 493a348e4bb58981be64a40718785d6587b8ff7d..7a15d38ad958fa8585d2c6c2f8986ef489457493 100644 (file)
--- a/src/Qtx/QtxMenu.h
+++ b/src/Qtx/QtxMenu.h
@@ -65,11 +65,17 @@ public:
 public slots:
   virtual void           setVisible( bool );
 
+protected:
+  virtual void           paintEvent( QPaintEvent* );
+
 private:
   void                   updateTitle();
   void                   insertTitle();
   void                   removeTitle();
 
+private  slots:
+  void                   resizeAfterRepaint();
+
 private:
   TitleMode              myMode;
   Title*                 myTitle;