github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Slider and Linux Chameleon improvements

Browse source
This commit is contained in:
Mirek Fidler 2025-01-23 00:10:37 +01:00
parent 97f86f4334
commit 50bbdd6ffd
11 changed files with 148 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

16
upptst/TestChStyle/TestChStyle.lay
View file

@ -1,5 +1,5 @@
LAYOUT(TestChStyleLayout, 972, 532)
ITEM(Upp::OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(12, 140).TopPosZ(324, 128))
ITEM(Upp::OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(16, 140).TopPosZ(304, 32))
ITEM(Upp::EditString, readonly, SetEditable(false).LeftPosZ(20, 80).TopPosZ(52, 19))
ITEM(Upp::DropList, dl_readonly, SetEditable(false).LeftPosZ(108, 96).TopPosZ(52, 19))
ITEM(Upp::WithDropChoice<Upp::EditString>, dc_readonly, SetEditable(false).LeftPosZ(212, 96).TopPosZ(52, 19))
@ -27,7 +27,7 @@ LAYOUT(TestChStyleLayout, 972, 532)
ITEM(Upp::TabCtrl, tab, LeftPosZ(316, 150).TopPosZ(136, 100))
ITEM(Upp::Label, dv___26, SetLabel(t_("This is label")).SetInk(Upp::Cyan).LeftPosZ(16, 168).TopPosZ(240, 19))
ITEM(Upp::DropTime, dv___27, LeftPosZ(316, 120).TopPosZ(244, 19))
ITEM(Upp::SliderCtrl, dv___28, LeftPosZ(16, 64).TopPosZ(272, 24))
ITEM(Upp::SliderCtrl, hslider, SetFrame(Upp::BlackFrame()).LeftPosZ(16, 72).TopPosZ(344, 24))
ITEM(Upp::Button, dis, SetLabel(t_("disabled")).LeftPosZ(88, 56).TopPosZ(272, 24))
ITEM(Upp::ArrayCtrl, dv___30, LeftPosZ(260, 52).TopPosZ(188, 100))
ITEM(Upp::ProgressIndicator, pi1, LeftPosZ(180, 192).TopPosZ(296, 12))
@ -35,8 +35,8 @@ LAYOUT(TestChStyleLayout, 972, 532)
ITEM(Upp::ProgressIndicator, pi5, LeftPosZ(180, 192).TopPosZ(328, 24))
ITEM(Upp::ProgressIndicator, pi3, LeftPosZ(380, 24).TopPosZ(296, 148))
ITEM(Upp::ProgressIndicator, pi4, LeftPosZ(412, 24).TopPosZ(296, 148))
ITEM(Upp::SliderCtrl, dv___36, LeftPosZ(180, 20).VCenterPosZ(80, 138))
UNTYPED(sample, LeftPosZ(212, 160).TopPosZ(364, 80))
ITEM(Upp::SliderCtrl, vslider, SetFrame(Upp::BlackFrame()).LeftPosZ(16, 20).VCenterPosZ(80, 186))
UNTYPED(sample, LeftPosZ(216, 156).TopPosZ(364, 80))
ITEM(Upp::DropList, dl_empty, LeftPosZ(480, 96).TopPosZ(4, 19))
ITEM(Upp::WithDropChoice<Upp::EditString>, dc_empty, LeftPosZ(480, 96).TopPosZ(28, 19))
ITEM(Upp::DataPusher, dv___40, LeftPosZ(480, 152).TopPosZ(52, 24))
@ -57,6 +57,12 @@ LAYOUT(TestChStyleLayout, 972, 532)
ITEM(Upp::TreeCtrl, dv___55, LeftPosZ(696, 152).TopPosZ(12, 196))
ITEM(Upp::RichTextView, dv___56, LeftPosZ(696, 152).TopPosZ(348, 136))
ITEM(Upp::ColumnList, dv___57, LeftPosZ(696, 152).TopPosZ(212, 132))
ITEM(Upp::DropList, skin, LeftPosZ(12, 164).TopPosZ(464, 19))
ITEM(Upp::DropList, skin, LeftPosZ(8, 140).TopPosZ(504, 19))
ITEM(Upp::Label, vslider_val, LeftPosZ(40, 40).TopPosZ(472, 19))
ITEM(Upp::SliderCtrl, vslider2, SetFrame(Upp::BlackFrame()).LeftPosZ(92, 20).VCenterPosZ(80, 186))
ITEM(Upp::Label, vslider_val2, LeftPosZ(116, 40).TopPosZ(472, 19))
ITEM(Upp::Label, hslider_val, LeftPosZ(92, 40).TopPosZ(344, 19))
ITEM(Upp::SliderCtrl, hslider2, SetFrame(Upp::BlackFrame()).LeftPosZ(16, 72).TopPosZ(372, 24))
ITEM(Upp::Label, hslider_val2, LeftPosZ(92, 40).TopPosZ(372, 19))
END_LAYOUT

12
upptst/TestChStyle/main.cpp
View file

@ -176,6 +176,18 @@ TestChStyle::TestChStyle()
FillTree(droptree.TreeObject());
vslider.Range(100);
vslider << [=] { vslider_val = ~~vslider; };
vslider2.MinMax(100, 0);
vslider2 << [=] { vslider_val2 = ~~vslider2; };
hslider.Range(100);
hslider << [=] { hslider_val = ~~hslider; };
hslider2.MinMax(100, 0);
hslider2 << [=] { hslider_val2 = ~~hslider2; };
Sizeable();
}