Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter

jkriege2 · Oct 25, 2023 · 536a6e6 · 536a6e6
2 parents 8b1c7c0 + a462164
commit 536a6e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/jkqtmath/CMakeLists.txt b/lib/jkqtmath/CMakeLists.txt
@@ -110,7 +110,7 @@ endif()
 if(JKQtPlotter_BUILD_STATIC_LIBS)
     add_library(${lib_name} STATIC ${SOURCES} ${HEADERS})
     JKQtCommon_setDefaultLibOptions(${lib_name})
-    target_link_libraries(${libsh_name} PUBLIC JKQTCommonLib)
+    target_link_libraries(${lib_name} PUBLIC JKQTCommonLib)
     set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME  "${lib_name_decorated}")
     write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake
                                      VERSION ${PROJECT_VERSION} 

diff --git a/lib/jkqtplotter/jkqtplotter.cpp b/lib/jkqtplotter/jkqtplotter.cpp
@@ -1370,8 +1370,13 @@ void JKQTPlotter::resizeEvent(QResizeEvent *event) {
          sizeChanged=true;
      }
      if (sizeChanged) {
-         resizeTimer.setSingleShot(true);
-         resizeTimer.start(jkqtp_RESIZE_DELAY);
+         if (jkqtp_RESIZE_DELAY == 0) {
+             // Do this now
+             delayedResizeEvent();
+         } else {
+             resizeTimer.setSingleShot(true);
+             resizeTimer.start(jkqtp_RESIZE_DELAY);
+         }
      }
 
      //updateGeometry();

diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h
@@ -364,7 +364,7 @@ JKQTPLOTTER_LIB_EXPORT void initJKQTPlotterResources();
 class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
         Q_OBJECT
     public:
-        /** \brief sets the global resize delay in milliseconds \a delayMS. After calling this function all plots will use the new delay. This function is thread-safe!
+        /** \brief sets the global resize delay in milliseconds \a delayMS. After calling this function all plots will use the new delay. Setting the the delay to 0 disables the delayed resize feature. This function is thread-safe!
           *
           * \see jkqtp_RESIZE_DELAY, setGlobalResizeDelay(), getGlobalResizeDelay(), resizeTimer */
         static void setGlobalResizeDelay(int delayMS);
@@ -1687,7 +1687,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget {
          */
         QTimer resizeTimer;
 
-        /** \brief delay for  resizing in milliseconds
+        /** \brief delay for resizing in milliseconds.  If set to 0, resize delay is disabled and resizeTimer is unused.
          *
          * \see jkqtp_RESIZE_DELAY, setGlobalResizeDelay(), getGlobalResizeDelay(), resizeTimer
          */