From 80d24fe43fd3be377c4d95f624f62f567d164188 Mon Sep 17 00:00:00 2001
From: Matevz Tadel <mtadel@ucsd.edu>
Date: Wed, 29 Oct 2025 21:41:53 -0700
Subject: [PATCH 1/2] Remove old TEve funcs and whitespace changes.

---
 graf3d/eve7/inc/ROOT/REveDigitSet.hxx         |  1 -
 .../eve7/inc/ROOT/REveSecondarySelectable.hxx |  6 -----
 graf3d/eve7/inc/ROOT/REveViewer.hxx           |  2 --
 graf3d/eve7/src/REveSelection.cxx             |  1 -
 graf3d/eve7/src/REveViewer.cxx                | 23 -------------------
 5 files changed, 33 deletions(-)

diff --git a/graf3d/eve7/inc/ROOT/REveDigitSet.hxx b/graf3d/eve7/inc/ROOT/REveDigitSet.hxx
index f392862df6f1d..9c11a4653561c 100644
--- a/graf3d/eve7/inc/ROOT/REveDigitSet.hxx
+++ b/graf3d/eve7/inc/ROOT/REveDigitSet.hxx
@@ -181,7 +181,6 @@ public:
 
    void    NewShapePicked(int shapeId, Int_t selectionId, bool multi);
 
-
    bool    RequiresExtraSelectionData() const override { return GetAlwaysSecSelect(); };
    void    FillExtraSelectionData(nlohmann::json& j, const std::set<int>& secondary_idcs) const override;
 
diff --git a/graf3d/eve7/inc/ROOT/REveSecondarySelectable.hxx b/graf3d/eve7/inc/ROOT/REveSecondarySelectable.hxx
index 7a7e203b4bc2b..1f718d886142d 100644
--- a/graf3d/eve7/inc/ROOT/REveSecondarySelectable.hxx
+++ b/graf3d/eve7/inc/ROOT/REveSecondarySelectable.hxx
@@ -36,9 +36,6 @@ protected:
    SelectionSet_t fSelectedSet;    // Selected indices.
    SelectionSet_t fHighlightedSet; // Highlighted indices.
 
-   // XXXX
-   // void ProcessGLSelectionInternal(TGLSelectRecord& rec, SelectionSet_t& sset);
-
 public:
    REveSecondarySelectable() = default;
    virtual ~REveSecondarySelectable() {}
@@ -48,9 +45,6 @@ public:
 
    SelectionSet_t &RefSelectedSet()    { return fSelectedSet; }
    SelectionSet_t &RefHighlightedSet() { return fHighlightedSet; }
-
-   // XXXX
-   // void   ProcessGLSelection(TGLSelectRecord& rec);
 };
 
 } // namespace Experimental
diff --git a/graf3d/eve7/inc/ROOT/REveViewer.hxx b/graf3d/eve7/inc/ROOT/REveViewer.hxx
index 42e2283a177eb..d26a3836dd359 100644
--- a/graf3d/eve7/inc/ROOT/REveViewer.hxx
+++ b/graf3d/eve7/inc/ROOT/REveViewer.hxx
@@ -125,8 +125,6 @@ protected:
    Float_t       fBrightness;
    Bool_t        fUseLightColorSet;
 
-   void HandleTooltip();
-
 public:
    REveViewerList(const std::string &n="REveViewerList", const std::string &t="");
    ~REveViewerList() override;
diff --git a/graf3d/eve7/src/REveSelection.cxx b/graf3d/eve7/src/REveSelection.cxx
index 5e3f74702b243..5452c674eb78e 100644
--- a/graf3d/eve7/src/REveSelection.cxx
+++ b/graf3d/eve7/src/REveSelection.cxx
@@ -709,7 +709,6 @@ Int_t REveSelection::WriteCoreJson(nlohmann::json &j, Int_t /* rnr_offset */)
       }
       rec["implied"]  = imp;
 
-
       if (i.first->RequiresExtraSelectionData()) {
          i.first->FillExtraSelectionData(rec["extra"], sec);
       }
diff --git a/graf3d/eve7/src/REveViewer.cxx b/graf3d/eve7/src/REveViewer.cxx
index d999d50201939..334d9806bc046 100644
--- a/graf3d/eve7/src/REveViewer.cxx
+++ b/graf3d/eve7/src/REveViewer.cxx
@@ -410,29 +410,6 @@ void REveViewerList::SceneDestructing(REveScene* scene)
    }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// Show / hide tooltip for various MouseOver events.
-/// Must be called from slots where sender is TGLEventHandler.
-
-void REveViewerList::HandleTooltip()
-{
-   if (fShowTooltip)
-   {
-      // TGLViewer       *glw = dynamic_cast<TGLViewer*>((TQObject*) gTQSender);
-      // TGLEventHandler *glh = (TGLEventHandler*) glw->GetEventHandler();
-      // if (REX::gEve->GetHighlight()->NumChildren() == 1)
-      // {
-      //    TString title(REX::gEve->GetHighlight()->FirstChild()->GetHighlightTooltip());
-      //    if ( ! title.IsNull())
-      //       glh->TriggerTooltip(title);
-      // }
-      // else
-      // {
-      //    glh->RemoveTooltip();
-      // }
-   }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Set color brightness.
 

From 8221fcc1bc2bee31dd4d0b5344ff2f84c9341c39 Mon Sep 17 00:00:00 2001
From: alja <amraktadel@ucsd.edu>
Date: Fri, 6 Feb 2026 15:01:39 -0800
Subject: [PATCH 2/2] Add necessary stamps when updating the main color in
 fSingleColor mode.

---
 graf3d/eve7/src/REveDigitSet.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/graf3d/eve7/src/REveDigitSet.cxx b/graf3d/eve7/src/REveDigitSet.cxx
index 0771fedd17914..86e628a6ff5fb 100644
--- a/graf3d/eve7/src/REveDigitSet.cxx
+++ b/graf3d/eve7/src/REveDigitSet.cxx
@@ -171,6 +171,7 @@ void REveDigitSet::SetMainColor(Color_t color)
    if (fSingleColor)
    {
       REveElement::SetMainColor(color);
+      StampObjProps();
    }
    else if (fFrame)
    {