From 1cb42be11a3413f406e9d05dc7cbf1621ec50536 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 5 Jul 2006 07:02:23 +0000
Subject: [PATCH] From Valeriy Onuchin: - GUI Builder: enable "crop button"
when lasso is drawn.
git-svn-id: http://root.cern.ch/svn/root/trunk@15694 27541ba8-7e3a-0410-8455-c3a389f83636
---
guibuilder/src/TGuiBldDragManager.cxx | 6 +++---
guibuilder/src/TRootGuiBuilder.cxx | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/guibuilder/src/TGuiBldDragManager.cxx b/guibuilder/src/TGuiBldDragManager.cxx
index 6fa0c5f6418..0c31f2fade9 100644
--- a/guibuilder/src/TGuiBldDragManager.cxx
+++ b/guibuilder/src/TGuiBldDragManager.cxx
@@ -1,4 +1,4 @@
-// @(#)root/guibuilder:$Name: $:$Id: TGuiBldDragManager.cxx,v 1.49 2006/06/01 11:38:57 antcheva Exp $
+// @(#)root/guibuilder:$Name: $:$Id: TGuiBldDragManager.cxx,v 1.50 2006/07/04 09:21:56 antcheva Exp $
// Author: Valeriy Onuchin 12/09/04
/*************************************************************************
@@ -6237,10 +6237,10 @@ void TGuiBldDragManager::SetLassoDrawn(Bool_t on)
fLassoDrawn = on;
if (fBuilder) {
- fBuilder->EnableLassoButtons(on);
-
if (on) {
fBuilder->EnableEditButtons(kFALSE);
}
+
+ fBuilder->EnableLassoButtons(on);
}
}
diff --git a/guibuilder/src/TRootGuiBuilder.cxx b/guibuilder/src/TRootGuiBuilder.cxx
index 491ed1435a3..31bc8380478 100644
--- a/guibuilder/src/TRootGuiBuilder.cxx
+++ b/guibuilder/src/TRootGuiBuilder.cxx
@@ -1,4 +1,4 @@
-// @(#)root/guibuilder:$Name: $:$Id: TRootGuiBuilder.cxx,v 1.36 2006/06/14 07:52:55 antcheva Exp $
+// @(#)root/guibuilder:$Name: $:$Id: TRootGuiBuilder.cxx,v 1.37 2006/06/14 10:22:37 antcheva Exp $
// Author: Valeriy Onuchin 12/09/04
/*************************************************************************
@@ -1165,6 +1165,12 @@ void TRootGuiBuilder::EnableLassoButtons(Bool_t on)
if (btn) {
btn->SetState(kButtonUp);
}
+
+ btn = fToolBar->GetButton(kCropAct);
+ if (btn) {
+ btn->SetState(!on ? kButtonDisabled : kButtonUp);
+ }
+
}
//______________________________________________________________________________
@@ -1273,7 +1279,7 @@ void TRootGuiBuilder::EnableEditButtons(Bool_t on)
btn = fToolBar->GetButton(kCropAct);
if (btn) {
- btn->SetState(!on ? kButtonDisabled : kButtonUp);
+ btn->SetState(!on && !lasso ? kButtonDisabled : kButtonUp);
}
btn = fToolBar->GetButton(kDeleteAct);
--
GitLab