[Igarden-commit] Garden/source/PlanTool TextBoxTool.cpp, 1.8.2.1, 1.8.2.2 TextBoxTool.h, 1.7, 1.7.2
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
[Igarden-commit] Garden/source/PlanTool TextBoxTool.cpp, 1.8.2.1, 1.8.2.2 TextBoxTool.h, 1.7, 1.7.2.1 TitleBoxTool.cpp, 1.11.2.1, 1.11.2.2 TitleBoxTool.h, 1.7, 1.7.2.1
|
From: Jeffrey B. <jlb...@us...> - 2007-02-11 21:39:22
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24316 Modified Files: Tag: Release_branch_v1 TextBoxTool.cpp TextBoxTool.h TitleBoxTool.cpp TitleBoxTool.h Log Message: Allow double-click of text boxes when a the text tool is picked Index: TextBoxTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/TextBoxTool.cpp,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** TextBoxTool.cpp 23 Jan 2007 03:22:25 -0000 1.8.2.1 --- TextBoxTool.cpp 11 Feb 2007 21:39:11 -0000 1.8.2.2 *************** *** 94,97 **** --- 94,98 ---- UserTextBox *newElem = NULL; PlanAddAction *action; + planLength_t minSize; PRECONDITION(view != NULL); *************** *** 128,132 **** newElem = new UserTextBox(rect); ! newElem->SetBorder(kBorderRounded); AddElementToAction(newElem); FinishAndPostAction(wview); --- 129,137 ---- newElem = new UserTextBox(rect); ! minSize = newElem->MinimumSize(wview, kBorderRounded); ! if(rect.xSize > minSize && rect.ySize > minSize) ! newElem->SetBorder(kBorderRounded); ! else ! newElem->SetBorder(kBorderPlain); AddElementToAction(newElem); FinishAndPostAction(wview); *************** *** 179,182 **** --- 184,213 ---- // --------------------------------------------------------------------------- + /// Click + // + void TextBoxTool::Click( PlanView * view, planPoint_t clickPoint, Int16 numClicks, Element* element ) + { + #pragma unused(numClicks, element) + SelectedElements *select; + planRectangle_t rect; + PlanTool *tool; + Element *elem; + + WritablePlanView *view2 = dynamic_cast<WritablePlanView*>(view); + MyAssert(view2 != NULL); + select = view2->GetSelectList(); + if(numClicks >= 2) + { + elem = select->GetSelectedElementOnPoint(clickPoint, view2); + if(elem != NULL) + { + tool = elem->GetCreateTool(view2); + if(tool != NULL) + tool->SetContentActive(true, elem); + } + } + } + + // --------------------------------------------------------------------------- // void TextBoxTool::GetTooltipText( LStr255& tooltipText ) // Index: TextBoxTool.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/TextBoxTool.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** TextBoxTool.h 19 Jun 2005 23:09:42 -0000 1.7 --- TextBoxTool.h 11 Feb 2007 21:39:12 -0000 1.7.2.1 *************** *** 31,34 **** --- 31,35 ---- virtual void SetContentActive(bool isActive, Element *elem); virtual void Drag(PlanView * view, planPoint_t inStartEvent, planPoint_t inEndEvent, dragType_t dragType, Element* element); + virtual void Click( PlanView * view, planPoint_t clickPoint, Int16 numClicks, Element* element ); virtual void GetTooltipText(XGString& tooltipText); virtual long DoGetMenuStatus( long arg, void* parg, Element* element ); Index: TitleBoxTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/TitleBoxTool.cpp,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** TitleBoxTool.cpp 23 Jan 2007 03:22:25 -0000 1.11.2.1 --- TitleBoxTool.cpp 11 Feb 2007 21:39:12 -0000 1.11.2.2 *************** *** 64,74 **** // --------------------------------------------------------------------------- ! // void TextBoxTool::Click( planPoint_t clickPoint, Int16 numClicks ) ! /// Called internally on a single or double-click (but not drag) from MouseDown and MouseUp. // void TitleBoxTool::Click( PlanView * view, planPoint_t clickPoint, Int16 numClicks, Element* element ) { ! #pragma unused(clickPoint) ! #pragma unused(numClicks) } --- 64,90 ---- // --------------------------------------------------------------------------- ! /// Click // void TitleBoxTool::Click( PlanView * view, planPoint_t clickPoint, Int16 numClicks, Element* element ) { ! #pragma unused(numClicks, element) ! SelectedElements *select; ! planRectangle_t rect; ! PlanTool *tool; ! Element *elem; ! ! WritablePlanView *view2 = dynamic_cast<WritablePlanView*>(view); ! MyAssert(view2 != NULL); ! select = view2->GetSelectList(); ! if(numClicks >= 2) ! { ! elem = select->GetSelectedElementOnPoint(clickPoint, view2); ! if(elem != NULL) ! { ! tool = elem->GetCreateTool(view2); ! if(tool != NULL) ! tool->SetContentActive(true, elem); ! } ! } } *************** *** 84,87 **** --- 100,104 ---- TitleBox *newElem = NULL; PlanAddAction *action; + planLength_t minSize; PRECONDITION(view != NULL); *************** *** 118,122 **** newElem = new TitleBox(rect); ! newElem->SetBorder(kBorderRounded); AddElementToAction(newElem); FinishAndPostAction(wview); --- 135,143 ---- newElem = new TitleBox(rect); ! minSize = newElem->MinimumSize(wview, kBorderRounded); ! if(rect.xSize > minSize && rect.ySize > minSize) ! newElem->SetBorder(kBorderRounded); ! else ! newElem->SetBorder(kBorderPlain); AddElementToAction(newElem); FinishAndPostAction(wview); *************** *** 169,173 **** } } - // --------------------------------------------------------------------------- --- 190,193 ---- Index: TitleBoxTool.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/TitleBoxTool.h,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** TitleBoxTool.h 19 Jun 2005 23:08:07 -0000 1.7 --- TitleBoxTool.h 11 Feb 2007 21:39:12 -0000 1.7.2.1 *************** *** 29,34 **** virtual ~TitleBoxTool(); virtual bool KeyPressed(PlanView * view, long keyEvent, Element* element); - void Click(PlanView * view, planPoint_t clickPoint, Int16 numClicks, Element* element); virtual void Drag(PlanView * view, planPoint_t inStartEvent, planPoint_t inEndEvent, dragType_t dragType, Element* element); virtual void GetTooltipText(XGString& tooltipText); long DoGetMenuStatus( long arg, void* parg, Element* element ); --- 29,34 ---- virtual ~TitleBoxTool(); virtual bool KeyPressed(PlanView * view, long keyEvent, Element* element); virtual void Drag(PlanView * view, planPoint_t inStartEvent, planPoint_t inEndEvent, dragType_t dragType, Element* element); + virtual void Click( PlanView * view, planPoint_t clickPoint, Int16 numClicks, Element* element ); virtual void GetTooltipText(XGString& tooltipText); long DoGetMenuStatus( long arg, void* parg, Element* element ); |