diff --git a/uppdev/ScrollTest/main.cpp b/uppdev/ScrollTest/main.cpp index a90cf65bb..76c1e3bef 100644 --- a/uppdev/ScrollTest/main.cpp +++ b/uppdev/ScrollTest/main.cpp @@ -1,75 +1,75 @@ -#include - -using namespace Upp; - -#define IMAGECLASS ImageImg -#define IMAGEFILE -#include - -#define IMAGECLASS ImageImg -#define IMAGEFILE -#include - -Image h; - -void InitSb() -{ - ScrollBar::Style& s = ScrollBar::StyleDefault().Write(); - s = s.Standard(); - Image uparrow = CtrlsImg::kUA(); - Size sz = ImageImg::Get(ImageImg::I_BU0).GetSize(); - s.barsize = sz.cx; - s.arrowsize = sz.cy; - - for(int i = 0; i < 4; i++) { - Image up = ImageImg::Get(ImageImg::I_BU0 + i); - s.up.look[i] = ChLookWith(up, uparrow); - Image vupper = ImageImg::Get(ImageImg::I_TU0 + i); - s.vupper[i] = vupper; - Image thumb = ImageImg::Get(ImageImg::I_TH0 + i); - Image thumbhandle = ImageImg::THH(); - s.vthumb[i] = ChLookWith(thumb, thumbhandle); - Image vlower = s.vlower[i] = MirrorVert(vupper); - Image down = MirrorVert(up); - Image downarrow = MirrorVert(uparrow); - s.down.look[i] = ChLookWith(down, downarrow); - - s.left.look[i] = ChLookWith(RotateClockwise(down), RotateClockwise(downarrow)); - s.hlower[i] = RotateClockwise(vlower); - - if(IsNull(h)) - h = RotateClockwise(vlower); - PNGEncoder().SaveFile("u:/" + AsString(i) + ".png", h); - DDUMP(h.GetHotSpot()); - DDUMP(h.Get2ndSpot()); - - s.hthumb[i] = ChLookWith(RotateClockwise(thumb), RotateClockwise(thumbhandle)); - s.hupper[i] = RotateClockwise(vupper); - s.right.look[i] = ChLookWith(RotateClockwise(up), RotateClockwise(uparrow)); - } -} - -struct Test : TopWindow { - virtual void Paint(Draw& w) - { - w.DrawRect(GetSize(), White()); - ChPaint(w, Rect(10, 10, 100, 20), h); - } - -}; - -GUI_APP_MAIN -{ -// InitSb(); -// Test().Run(); - - TopWindow app; - app.Sizeable(); - ArrayCtrl x; - x.HeaderObject().Absolute(); - x.AddColumn("", 2000); - for(int i = 0; i < 1/*000*/; i++) - x.Add(i); - app.Add(x.SizePos()); - app.Run(); -} +#include + +using namespace Upp; + +#define IMAGECLASS ImageImg +#define IMAGEFILE +#include + +#define IMAGECLASS ImageImg +#define IMAGEFILE +#include + +Image h; + +void InitSb() +{ + ScrollBar::Style& s = ScrollBar::StyleDefault().Write(); + s = s.Standard(); + Image uparrow = CtrlsImg::kUA(); + Size sz = ImageImg::Get(ImageImg::I_BU0).GetSize(); + s.barsize = sz.cx; + s.arrowsize = sz.cy; + + for(int i = 0; i < 4; i++) { + Image up = ImageImg::Get(ImageImg::I_BU0 + i); + s.up.look[i] = ChLookWith(up, uparrow); + Image vupper = ImageImg::Get(ImageImg::I_TU0 + i); + s.vupper[i] = vupper; + Image thumb = ImageImg::Get(ImageImg::I_TH0 + i); + Image thumbhandle = ImageImg::THH(); + s.vthumb[i] = ChLookWith(thumb, thumbhandle); + Image vlower = s.vlower[i] = MirrorVert(vupper); + Image down = MirrorVert(up); + Image downarrow = MirrorVert(uparrow); + s.down.look[i] = ChLookWith(down, downarrow); + s.left.look[i] = ChLookWith(RotateClockwise(down), RotateClockwise(downarrow)); + s.hlower[i] = RotateClockwise(vlower); + s.hthumb[i] = ChLookWith(RotateClockwise(thumb), RotateClockwise(thumbhandle)); + s.hupper[i] = RotateClockwise(vupper); + s.right.look[i] = ChLookWith(RotateClockwise(up), RotateClockwise(uparrow)); + } +} + +struct Test : TopWindow { + virtual void Paint(Draw& w) + { + w.DrawRect(GetSize(), White()); + ChPaint(w, Rect(10, 10, 100, 20), h); + } + +}; + +struct MyApp : TopWindow { + virtual void Activate() { Ctrl::ReSkin(); } + + ArrayCtrl x; + + MyApp() { + Sizeable(); + x.HeaderObject().Absolute(); + x.AddColumn("", 2000); + for(int i = 0; i < 1000; i++) + x.Add(i); + Add(x.SizePos()); + } + +}; + +GUI_APP_MAIN +{ +// InitSb(); +// Test().Run(); + + MyApp().Run(); +} diff --git a/uppdev/chtest1123/main.cpp b/uppdev/chtest1123/main.cpp index 189250be2..db19f5f69 100644 --- a/uppdev/chtest1123/main.cpp +++ b/uppdev/chtest1123/main.cpp @@ -4,15 +4,14 @@ using namespace Upp; struct App : public TopWindow { - MultiButtonFrame drop; + virtual void Paint(Draw& w) + { + w.DrawRect(GetSize(), White()); + ChPaint(w, GetSize(), Button::StyleScroll().look[0]); + } App() { - SetRect( Size( 200, 25 ) ); - drop.AddTo( *this ); - drop.AddButton().Main(); - drop.SetStyle( MultiButtonFrame::StyleFrame() ); - drop.AddButton().Left().SetLabel( "Button" ); } };