From 570915e6c15199a1f610c1f751415301057efcd8 Mon Sep 17 00:00:00 2001
From: LoudSnorer <just4me.1947@gmail.com>
Date: Tue, 21 Mar 2023 19:03:29 -0400
Subject: [PATCH] fix turn graph tooltips off problem.

---
 oscar/Graphs/gGraphView.cpp | 7 +++++--
 oscar/Graphs/gGraphView.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp
index f4b688ca..7159858a 100644
--- a/oscar/Graphs/gGraphView.cpp
+++ b/oscar/Graphs/gGraphView.cpp
@@ -169,8 +169,11 @@ w+=m_spacer*2;
 h+=m_spacer*2; */
 //}
 
-void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int timeout)
+void gToolTip::display(QString text, int x, int y, ToolTipAlignment align, int timeout,bool alwaysShow)
 {
+    if (!alwaysShow && !AppSetting->graphTooltips())  {
+        return;
+    }
     if (timeout <= 0) {
         timeout = AppSetting->tooltipTimeout();
     }
@@ -343,7 +346,7 @@ void gParentToolTip::paint(QPainter &painter,int width,int height) {
     if (!m_parent_visible) {return ;};
     m_width=width;
     m_height=height;
-    gToolTip::display(m_text, 0, 0,m_alignment, m_timeout);
+    gToolTip::display(m_text, 0, 0,m_alignment, m_timeout,true);
     gToolTip::paint(painter);
 };
 
diff --git a/oscar/Graphs/gGraphView.h b/oscar/Graphs/gGraphView.h
index 49337e65..b9a4528d 100644
--- a/oscar/Graphs/gGraphView.h
+++ b/oscar/Graphs/gGraphView.h
@@ -235,7 +235,7 @@ class gToolTip : public QObject
     /*! \fn virtual void display(QString text, int x, int y, int timeout=2000);
         \brief Set the tooltips display message, position, and timeout value
         */
-    virtual void display(QString text, int x, int y, ToolTipAlignment align = TT_AlignCenter, int timeout = 0);
+    virtual void display(QString text, int x, int y, ToolTipAlignment align = TT_AlignCenter, int timeout = 0,bool alwaysShow=false);
 
     //! \brief Draw the tooltip
     virtual void paint(QPainter &paint); //actually paints it.