From de9f9e402dfa4a1f0d9f96d973a678d202c0b2ca Mon Sep 17 00:00:00 2001 From: koldo Date: Sun, 20 Dec 2015 21:21:03 +0000 Subject: [PATCH] Controls4U_Demo: Added SplitterButton git-svn-id: svn://ultimatepp.org/upp/trunk@9310 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- bazaar/Controls4U_Demo/Controls4U_Demo.h | 12 ++++++++++++ bazaar/Controls4U_Demo/JBControlsDemo.lay | 10 +++++----- bazaar/Controls4U_Demo/main.cpp | 21 ++++++++++++++++++++- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/bazaar/Controls4U_Demo/Controls4U_Demo.h b/bazaar/Controls4U_Demo/Controls4U_Demo.h index f376621d3..82fa46ac7 100644 --- a/bazaar/Controls4U_Demo/Controls4U_Demo.h +++ b/bazaar/Controls4U_Demo/Controls4U_Demo.h @@ -72,6 +72,17 @@ public: StaticImageSet_Demo(); }; +class SplitterButton_Demo : public StaticRect { +public: + typedef SplitterButton_Demo CLASSNAME; + SplitterButton_Demo(); + +private: + SplitterButton splitterH, splitterV; + ArrayCtrl left, top, bottom; +}; + + class Controls4U_Demo : public WithMain { public: typedef Controls4U_Demo CLASSNAME; @@ -87,6 +98,7 @@ public: Functions4U_Demo functions4U_Demo; PainterCanvas_Demo painterCanvas_Demo; StaticImageSet_Demo staticImageSet_Demo; + SplitterButton_Demo splitterButton_Demo; AboutUpp aboutDlg; #if defined(PLATFORM_WIN32) Firefox_Demo firefox_Demo; diff --git a/bazaar/Controls4U_Demo/JBControlsDemo.lay b/bazaar/Controls4U_Demo/JBControlsDemo.lay index 86db97959..2192cdbda 100644 --- a/bazaar/Controls4U_Demo/JBControlsDemo.lay +++ b/bazaar/Controls4U_Demo/JBControlsDemo.lay @@ -1,12 +1,12 @@ LAYOUT(JBControlsDemoLayout, 456, 432) - ITEM(SliderCtrlX, slider, FillColor(Color(255, 85, 0)).SetThickness(3).SetThumbType(4).Jump(true).LeftPosZ(63, 330).TopPosZ(220, 52)) + ITEM(SliderCtrlX, slider, Jump(true).FillColor(Color(255, 85, 0)).SetThickness(3).SetThumbType(4).LeftPosZ(63, 330).TopPosZ(220, 52)) ITEM(ProgressIndicator, progress, LeftPosZ(62, 331).TopPosZ(124, 24)) ITEM(Meter, meter, SetAngleBegin(120).SetAngleEnd(60).LeftPosZ(64, 160).TopPosZ(12, 108)) - ITEM(SliderCtrlX, slider2, SetMaxi(150).SetMinorTicks(5).SetMajorTicksSize(40).SetMinorTicksSize(25).SetThumbType(2).Step(10).SetFrame(InsetFrame()).LeftPosZ(8, 340).TopPosZ(280, 48)) - ITEM(Meter, meter2, SetMax(150).SetPeak(120).SetStep(30).SetColorType(1).LeftPosZ(228, 162).TopPosZ(12, 108)) - ITEM(SliderCtrlX, indic, SetSliderType(1).FillColor(Color(56, 255, 200)).SetThickness(5).SetThumbType(0).SetFrame(OutsetFrame()).LeftPosZ(62, 332).TopPosZ(156, 52)) + ITEM(SliderCtrlX, slider2, SetMinorTicks(5).SetMaxi(150).SetMajorTicksSize(40).SetMinorTicksSize(25).SetThumbType(2).Step(10).SetFrame(InsetFrame()).LeftPosZ(8, 340).TopPosZ(280, 48)) + ITEM(Meter, meter2, SetPeak(120).SetStep(30).SetMax(150).SetColorType(1).LeftPosZ(228, 162).TopPosZ(12, 108)) + ITEM(SliderCtrlX, indic, FillColor(Color(56, 255, 200)).SetSliderType(1).SetThickness(5).SetThumbType(0).SetFrame(OutsetFrame()).LeftPosZ(62, 332).TopPosZ(156, 52)) ITEM(SliderCtrlX, vslider, SetInverted(true).FillColor(Yellow).LeftPosZ(8, 44).TopPosZ(12, 260)) - ITEM(SliderCtrlX, vindic, SetSliderType(1).FillColor(Color(200, 255, 56)).SetTickPosition(3).SetThickness(5).SetThumbType(0).LeftPosZ(404, 44).TopPosZ(12, 260)) + ITEM(SliderCtrlX, vindic, FillColor(Color(200, 255, 56)).SetSliderType(1).SetTickPosition(3).SetThickness(5).SetThumbType(0).LeftPosZ(404, 44).TopPosZ(12, 260)) ITEM(StarIndicator, jbstar, LeftPosZ(78, 300).TopPosZ(336, 60)) ITEM(StarIndicator, jbstar2, SetVotesHigh(80).SetVotesLow(15).LeftPosZ(174, 108).TopPosZ(404, 20)) ITEM(Option, novotes, SetLabel(t_("Undefined number of votes")).LeftPosZ(288, 152).TopPosZ(408, 16)) diff --git a/bazaar/Controls4U_Demo/main.cpp b/bazaar/Controls4U_Demo/main.cpp index 03341b8e6..7b8a0ea8d 100644 --- a/bazaar/Controls4U_Demo/main.cpp +++ b/bazaar/Controls4U_Demo/main.cpp @@ -29,6 +29,7 @@ Controls4U_Demo::Controls4U_Demo() { controls.Add(&staticCtrlsTest_Demo);grid.Add("Static Controls Test"); //tab.Add(painterCanvas_Demo); grid.Add("PainterCanvas (experimental)"); controls.Add(&functions4U_Demo); grid.Add("Functions4U samples"); + controls.Add(&splitterButton_Demo); grid.Add("SplitterButton"); #if defined(PLATFORM_WIN32) controls.Add(&vlc_Demo); grid.Add("VLC ActiveX"); controls.Add(&firefox_Demo); grid.Add("Firefox ActiveX"); @@ -40,7 +41,7 @@ Controls4U_Demo::Controls4U_Demo() { rect.Add(controls[i]->SizePos()); grid.WhenSel << THISBACK (OnGridSel); - grid.SetCursor(2); + grid.SetCursor(9); OnGridSel(); timerOn = false; @@ -266,6 +267,24 @@ StaticImageSet_Demo::StaticImageSet_Demo() { imageSet.Add(Images::ClockImage()); } +SplitterButton_Demo::SplitterButton_Demo() { + Add(splitterH.SizePos()); + + splitterV.Vert(top.SizePos(), bottom.SizePos()).SetPositions(1000, 5000, 9000).SetInitialPositionId(1); + splitterH.Horz(left.SizePos(), splitterV.SizePos()).SetPositions(1000, 5000, 9000).SetInitialPositionId(1); + + top.AddColumn("Column"); + bottom.AddColumn("Column"); + left.AddColumn("Column"); + for (int i = 0; i < 200; ++i) { + String str = Format("Data %d", i); + top.Add(str); + bottom.Add(str); + left.Add(str); + } +} + + void Controls4U_Demo::OnGridSel() { int row = grid.GetCursor(); for (int i = 0; i < controls.GetCount(); ++i) {