Skip to content

Commit e506d51

Browse files
Rene BrunRene Brun
Rene Brun
authored and
Rene Brun
committed
From Valeriy Onuchin:
 add vertical and horizonthal separation lines to the gui builder git-svn-id: http://root.cern.ch/svn/root/trunk@10129 27541ba8-7e3a-0410-8455-c3a389f83636
1 parent 680c93b commit e506d51

File tree

5 files changed

+127
-8
lines changed

5 files changed

+127
-8
lines changed

‎guibuilder/inc/TGuiBuilder.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// @(#)root/guibuilder:$Name: $:$Id: TGuiBuilder.h,v 1.4 2004/09/20 21:00:40 brun Exp $
1+
// @(#)root/guibuilder:$Name: $:$Id: TGuiBuilder.h,v 1.5 2004/09/21 10:09:18 brun Exp $
22
// Author: Valeriy Onuchin 12/09/04
33

44
/*************************************************************************
@@ -88,9 +88,11 @@ class TGuiBuilder : public TVirtualGuiBld, public TGMainFrame {
8888
virtual void EraseStatusBar();
8989

9090
TGMdiFrame *FindEditableMdiFrame(const TGWindow *win);
91-
9291
TGuiBldEditor *GetEditor() const { return fEditor; }
9392

93+
static TGFrame *VSplitter();
94+
static TGFrame *HSplitter();
95+
9496
ClassDef(TGuiBuilder,0) // gui builder
9597
};
9698

‎guibuilder/src/TGuiBldDragManager.cxx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// @(#)root/guibuilder:$Name: $:$Id: TGuiBldDragManager.cxx,v 1.9 2004/09/21 16:23:36 brun Exp $
1+
// @(#)root/guibuilder:$Name: $:$Id: TGuiBldDragManager.cxx,v 1.10 2004/09/21 17:53:10 brun Exp $
22
// Author: Valeriy Onuchin 12/09/04
33

44
/*************************************************************************
@@ -2215,7 +2215,7 @@ void TGuiBldDragManager::PlaceFrame(TGFrame *frame)
22152215
TGCompositeFrame *edit = (TGCompositeFrame*)fClient->GetRoot();
22162216
ReparentFrames(frame, edit);
22172217
frame->MapRaised();
2218-
edit->SetLayoutBroken();
2218+
//edit->SetLayoutBroken();
22192219
UInt_t g = GetGridStep()/2;
22202220
edit->AddFrame(frame, new TGLayoutHints(kLHintsNormal, g, g, g, g));
22212221
}
@@ -2562,7 +2562,7 @@ void TGuiBldDragManager::SetEditable(Bool_t on)
25622562

25632563
TGFrame *fr = (TGFrame*)fClient->GetRoot();
25642564
fEventMask = fr->GetEventMask(); //saved event mask
2565-
fr->AddInput(kKeyPressMask);
2565+
fr->AddInput(kKeyPressMask | kButtonPressMask);
25662566

25672567
if (fPimpl->fRepeatTimer) {
25682568
fPimpl->fRepeatTimer->Reset();

‎guibuilder/src/TGuiBuilder.cxx

+62-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// @(#)root/guibuilder:$Name: $:$Id: TGuiBuilder.cxx,v 1.11 2004/09/21 16:23:36 brun Exp $
1+
// @(#)root/guibuilder:$Name: $:$Id: TGuiBuilder.cxx,v 1.12 2004/09/21 17:53:10 brun Exp $
22
// Author: Valeriy Onuchin 12/09/04
33

44
/*************************************************************************
@@ -318,6 +318,16 @@ TGuiBuilder::TGuiBuilder(const TGWindow *p) : TVirtualGuiBld(),
318318
act->fPic = "bld_groupframe.xpm";
319319
AddAction(act, "Containers");
320320

321+
act = new TGuiBldAction("TGVSplitter", "Horizontal Panes", kGuiBldFunc);
322+
act->fAct = "TGuiBuilder::VSplitter()";
323+
act->fPic = "bld_hpaned.xpm";
324+
AddAction(act, "Containers");
325+
326+
act = new TGuiBldAction("TGHSplitter", "Vertical Panes", kGuiBldFunc);
327+
act->fAct = "TGuiBuilder::HSplitter()";
328+
act->fPic = "bld_vpaned.xpm";
329+
AddAction(act, "Containers");
330+
321331
fShutter->Resize(140, fShutter->GetHeight());
322332

323333
fStatusBar = new TGStatusBar(this, 40, 10);
@@ -697,9 +707,8 @@ Bool_t TGuiBuilder::NewProject(Event_t *)
697707
fEditable->SetWindowName(fEditable->GetName());
698708
fEditable->SetEditDisabled(kFALSE);
699709
fEditable->MapRaised();
700-
fEditable->AddInput(kButtonPressMask);
710+
fEditable->AddInput(kKeyPressMask | kButtonPressMask);
701711
fEditable->SetEditable(kTRUE);
702-
fEditable->AddInput(kKeyPressMask);
703712

704713
return kTRUE;
705714
}
@@ -1049,3 +1058,53 @@ void TGuiBuilder::BindKeys()
10491058
gVirtualX->GrabKey(fId, gVirtualX->KeysymToKeycode(kKey_Backspace),
10501059
kKeyShiftMask, kTRUE);
10511060
}
1061+
1062+
//______________________________________________________________________________
1063+
TGFrame *TGuiBuilder::VSplitter()
1064+
{
1065+
//
1066+
1067+
TGHorizontalFrame *ret = new TGHorizontalFrame();
1068+
ret->MustCleanup();
1069+
TGVerticalFrame *v1 = new TGVerticalFrame(ret, 40, 10, kSunkenFrame | kFixedWidth);
1070+
v1->MustCleanup();
1071+
ret->AddFrame(v1, new TGLayoutHints(kLHintsLeft | kLHintsExpandY));
1072+
1073+
TGVSplitter *splitter = new TGVSplitter(ret);
1074+
splitter->SetFrame(v1, kTRUE);
1075+
ret->AddFrame(splitter, new TGLayoutHints(kLHintsLeft | kLHintsExpandY));
1076+
1077+
TGVerticalFrame *v2 = new TGVerticalFrame(ret, 10, 10, kSunkenFrame);
1078+
v2->ChangeOptions(kSunkenFrame);
1079+
v2->MustCleanup();
1080+
ret->AddFrame(v2, new TGLayoutHints(kLHintsRight | kLHintsExpandX | kLHintsExpandY));
1081+
1082+
ret->MapSubwindows();
1083+
ret->SetLayoutBroken(kFALSE);
1084+
return ret;
1085+
}
1086+
1087+
//______________________________________________________________________________
1088+
TGFrame *TGuiBuilder::HSplitter()
1089+
{
1090+
//
1091+
1092+
TGVerticalFrame *ret = new TGVerticalFrame();
1093+
ret->MustCleanup();
1094+
TGHorizontalFrame *v1 = new TGHorizontalFrame(ret, 10, 40, kSunkenFrame | kFixedHeight);
1095+
v1->MustCleanup();
1096+
ret->AddFrame(v1, new TGLayoutHints(kLHintsTop | kLHintsExpandX));
1097+
1098+
TGHSplitter *splitter = new TGHSplitter(ret);
1099+
splitter->SetFrame(v1, kTRUE);
1100+
ret->AddFrame(splitter, new TGLayoutHints(kLHintsTop | kLHintsExpandX));
1101+
1102+
TGHorizontalFrame *v2 = new TGHorizontalFrame(ret, 10, 10);
1103+
v2->ChangeOptions(kSunkenFrame);
1104+
v2->MustCleanup();
1105+
ret->AddFrame(v2, new TGLayoutHints(kLHintsBottom | kLHintsExpandX | kLHintsExpandY));
1106+
1107+
ret->MapSubwindows();
1108+
ret->SetLayoutBroken(kFALSE);
1109+
return ret;
1110+
}

‎icons/bld_hpaned.xpm

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* XPM */
2+
static char * hpaned_xpm[] = {
3+
"21 21 5 1",
4+
" c None",
5+
". c #FFFFFF",
6+
"+ c #000000",
7+
"@ c #D6D6D6",
8+
"# c #7B7B7B",
9+
"..........+.........+",
10+
".@@@@@@@@#+.@@@@@@@#+",
11+
".@@@@@@@@#+.@@@@@@@#+",
12+
".@@@@@@@@#+.@@@@@@@#+",
13+
".@@@@@@@@#+.@@@@@@@#+",
14+
".@@@@@@@@#+.@@@@@@@#+",
15+
".@@@@@@@@#+.@@@@@@@#+",
16+
".@@@@@@@@#+.@@@@@@@#+",
17+
".@@@@@@@@#+.@@@@@@@#+",
18+
".@@@@@@@@#+.@@@@@@@#+",
19+
".@@@@@@@@#+.@@@@@@@#+",
20+
".@@@@@@@@#+.@@@@@@@#+",
21+
".@@@@@@#####@@@@@@@#+",
22+
".@@@@@@#...##@@@@@@#+",
23+
".@@@@@@#...##@@@@@@#+",
24+
".@@@@@@#...##@@@@@@#+",
25+
".@@@@@@######@@@@@@#+",
26+
".@@@@@@@#####@@@@@@#+",
27+
".@@@@@@@@#+.@@@@@@@#+",
28+
".#########+.########+",
29+
"+++++++++++++++++++++"};

‎icons/bld_vpaned.xpm

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* XPM */
2+
static char * vpaned_xpm[] = {
3+
"21 21 5 1",
4+
" c None",
5+
". c #FFFFFF",
6+
"+ c #000000",
7+
"@ c #D6D6D6",
8+
"# c #7B7B7B",
9+
"....................+",
10+
".@@@@@@@@@@@@@@@@@@#+",
11+
".@@@@@@@@@@@@@@@@@@#+",
12+
".@@@@@@@@@@@@@@@@@@#+",
13+
".@@@@@@@@@@@@@@@@@@#+",
14+
".@@@@@@@@@@@@@@@@@@#+",
15+
".@@@@@@@@@@@@@@@@@@#+",
16+
".@@@@@@@@@@@#####@@#+",
17+
".@@@@@@@@@@@#...##@#+",
18+
".############...####+",
19+
"++++++++++++#...##+++",
20+
"............######..+",
21+
".@@@@@@@@@@@@#####@#+",
22+
".@@@@@@@@@@@@@@@@@@#+",
23+
".@@@@@@@@@@@@@@@@@@#+",
24+
".@@@@@@@@@@@@@@@@@@#+",
25+
".@@@@@@@@@@@@@@@@@@#+",
26+
".@@@@@@@@@@@@@@@@@@#+",
27+
".@@@@@@@@@@@@@@@@@@#+",
28+
".###################+",
29+
"+++++++++++++++++++++"};

0 commit comments

Comments
 (0)