Skip to content
Snippets Groups Projects
Commit 038d658e authored by Matevz Tadel's avatar Matevz Tadel
Browse files

Merge rev 37158 from fireworks branch.

Store and restore gTQSender in slot methods that call further signal
emitting functions.


git-svn-id: http://root.cern.ch/svn/root/trunk@37195 27541ba8-7e3a-0410-8455-c3a389f83636
parent 5aa3783c
No related branches found
No related tags found
No related merge requests found
...@@ -560,7 +560,10 @@ void TEveViewerList::OnMouseOver(TObject *obj, UInt_t /*state*/) ...@@ -560,7 +560,10 @@ void TEveViewerList::OnMouseOver(TObject *obj, UInt_t /*state*/)
TEveElement *el = dynamic_cast<TEveElement*>(obj); TEveElement *el = dynamic_cast<TEveElement*>(obj);
if (el && !el->IsPickable()) if (el && !el->IsPickable())
el = 0; el = 0;
void *qsender = gTQSender;
gEve->GetHighlight()->UserPickedElement(el, kFALSE); gEve->GetHighlight()->UserPickedElement(el, kFALSE);
gTQSender = qsender;
HandleTooltip(); HandleTooltip();
} }
...@@ -579,7 +582,10 @@ void TEveViewerList::OnReMouseOver(TObject *obj, UInt_t /*state*/) ...@@ -579,7 +582,10 @@ void TEveViewerList::OnReMouseOver(TObject *obj, UInt_t /*state*/)
TEveElement* el = dynamic_cast<TEveElement*>(obj); TEveElement* el = dynamic_cast<TEveElement*>(obj);
if (el && !el->IsPickable()) if (el && !el->IsPickable())
el = 0; el = 0;
void *qsender = gTQSender;
gEve->GetHighlight()->UserRePickedElement(el); gEve->GetHighlight()->UserRePickedElement(el);
gTQSender = qsender;
HandleTooltip(); HandleTooltip();
} }
...@@ -598,7 +604,10 @@ void TEveViewerList::OnUnMouseOver(TObject *obj, UInt_t /*state*/) ...@@ -598,7 +604,10 @@ void TEveViewerList::OnUnMouseOver(TObject *obj, UInt_t /*state*/)
TEveElement* el = dynamic_cast<TEveElement*>(obj); TEveElement* el = dynamic_cast<TEveElement*>(obj);
if (el && !el->IsPickable()) if (el && !el->IsPickable())
el = 0; el = 0;
void *qsender = gTQSender;
gEve->GetHighlight()->UserUnPickedElement(el); gEve->GetHighlight()->UserUnPickedElement(el);
gTQSender = qsender;
HandleTooltip(); HandleTooltip();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment