mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-24 14:22:40 -06:00
CtrlLib, ide: Improved zoom icon in help and layout designer
This commit is contained in:
Mirek Fidler
parent
58e3f59c34
commit
074c98382d
7 changed files with 96 additions and 70 deletions
|
|
@ -123,6 +123,8 @@ IMAGE_ID(HorzPos__UHD)
|
|||
IMAGE_ID(HorzPos)
|
||||
IMAGE_ID(HorzSplit__UHD)
|
||||
IMAGE_ID(HorzSplit)
|
||||
IMAGE_ID(Numbers1)
|
||||
IMAGE_ID(Numbers2)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,155,221,109,227,48,12,199,185,68,222,251,108,224,128,110,144,41,180,68,150,136,231,241,18,89,194,19,220,91)
|
||||
|
|
@ -724,7 +726,19 @@ IMAGE_DATA(96,210,255,68,89,173,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|||
IMAGE_END_DATA(1728, 17)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,99,18,99,16,100,224,98,224,96,32,6,252,199,1,136,210,76,192,92,100,227,97,236,81,115,73,55,23,91,156)
|
||||
IMAGE_DATA(16,99,46,190,184,196,167,135,24,115,241,137,51,224,72,86,216,204,197,166,6,217,108,100,49,124,24,93,63,33,181,180)
|
||||
IMAGE_DATA(114,47,45,195,23,89,158,92,115,113,153,137,11,16,99,46,57,96,212,92,132,185,56,210,21,94,0,0,114,79,232,97)
|
||||
IMAGE_END_DATA(96, 1)
|
||||
IMAGE_DATA(120,156,237,86,59,110,195,48,12,37,58,20,69,183,46,61,67,86,175,70,207,163,243,248,52,218,115,14,29,198,253,153)
|
||||
IMAGE_DATA(245,195,203,35,205,164,200,22,2,66,44,138,124,226,35,41,41,79,239,246,102,175,246,98,21,89,3,41,57,31,224,34)
|
||||
IMAGE_DATA(188,127,63,112,175,199,85,53,169,224,102,181,204,124,42,184,153,222,130,182,82,184,202,6,177,81,151,13,246,63,178,189)
|
||||
IMAGE_DATA(87,188,247,204,47,174,223,138,27,97,70,82,193,189,69,30,184,59,110,208,87,169,156,79,246,140,243,201,126,27,113,18)
|
||||
IMAGE_DATA(58,179,189,249,167,96,142,182,184,190,210,58,227,241,58,227,225,126,38,236,153,104,52,175,218,161,48,255,107,127,57,39)
|
||||
IMAGE_DATA(188,79,198,175,154,239,106,190,42,121,224,250,171,120,142,242,203,252,35,59,213,15,89,124,42,182,204,190,18,95,102,199)
|
||||
IMAGE_DATA(122,117,62,216,79,245,247,145,253,81,253,44,89,255,155,159,63,46,255,173,205,95,99,108,70,157,214,154,216,192,117,108)
|
||||
IMAGE_DATA(31,233,93,150,109,31,156,99,50,26,172,117,208,207,219,88,105,56,22,198,143,248,24,207,66,216,77,124,163,189,203,76)
|
||||
IMAGE_DATA(92,6,249,42,76,140,105,36,54,46,11,96,57,87,22,244,197,24,22,219,185,121,174,216,6,249,52,187,172,77,246,2)
|
||||
IMAGE_DATA(68,49,15,210,15,219,57,163,175,226,50,132,14,69,225,56,71,231,203,117,113,94,236,203,243,111,201,248,58,15,156,115)
|
||||
IMAGE_DATA(255,96,206,57,78,238,77,183,233,160,231,156,68,189,195,56,88,223,110,255,231,139,121,101,241,250,50,30,239,133,88,30)
|
||||
IMAGE_DATA(15,158,229,74,191,249,94,205,46,123,27,207,111,23,254,213,126,238,194,14,197,113,248,78,82,15,25,239,203,247,5,223)
|
||||
IMAGE_DATA(65,157,214,121,174,206,67,179,189,54,209,125,229,194,241,117,129,201,251,70,181,199,59,149,239,204,69,124,99,93,124,206)
|
||||
IMAGE_DATA(184,216,183,104,239,60,60,7,234,220,113,204,88,19,236,55,245,46,44,100,171,36,122,143,216,94,157,71,247,97,190,248)
|
||||
IMAGE_DATA(142,68,247,195,15,247,79,0,233,247,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(480, 3)
|
||||
|
|
|
|||
|
|
@ -432,4 +432,37 @@ void FileSelButton::Detach()
|
|||
if(p) p->RemoveFrame(button);
|
||||
}
|
||||
|
||||
struct ZoomIconMaker : ImageMaker {
|
||||
double zoom;
|
||||
|
||||
String Key() const override {
|
||||
return String((byte *)&zoom, sizeof(zoom));
|
||||
}
|
||||
Image Make() const override {
|
||||
Size sz(DPI(16), DPI(16));
|
||||
ImagePainter w(sz);
|
||||
w.Clear(RGBAZero());
|
||||
w.Move(DPI(11), DPI(11)).Line(DPI(16), DPI(16)).Stroke(DPI(2), SBlack());
|
||||
w.Circle(DPI(7), DPI(7), IsUHDMode() ? 12 : 6.5).Stroke(IsUHDMode() ? 3 : 1, SBlack());
|
||||
String txt = AsString(int(zoom * 100));
|
||||
Image numbers = IsUHDMode() ? CtrlImg::Numbers2() : CtrlImg::Numbers1();
|
||||
int gcx = IsUHDMode() ? 6 : 4;
|
||||
Size tsz(txt.GetCount() * gcx, numbers.GetHeight());
|
||||
int y = DPI(7) - tsz.cy / 2;
|
||||
int x = DPI(7) - tsz.cx / 2;
|
||||
for(int c : txt) {
|
||||
w.DrawImage(x, y, gcx, tsz.cy, numbers, RectC((c - '0') * gcx, 0, gcx, tsz.cy), SLtBlue());
|
||||
x += gcx;
|
||||
}
|
||||
return w;
|
||||
}
|
||||
};
|
||||
|
||||
Image MakeZoomIcon(double scale)
|
||||
{
|
||||
ZoomIconMaker m;
|
||||
m.zoom = scale;
|
||||
return MakeImage(m);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -510,6 +510,8 @@ struct OpenFileButton : FileSelButton { OpenFileButton(const char *title = NULL
|
|||
struct SaveFileButton : FileSelButton { SaveFileButton(const char *title = NULL) : FileSelButton(MODE_SAVE, title) {} };
|
||||
struct SelectDirButton : FileSelButton { SelectDirButton(const char *title = NULL) : FileSelButton(MODE_DIR, title) {} };
|
||||
|
||||
Image MakeZoomIcon(double scale);
|
||||
|
||||
void Set(ArrayCtrl& array, int ii, IdCtrls& m);
|
||||
void Get(ArrayCtrl& array, int ii, IdCtrls& m);
|
||||
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ void HelpWindow::SetZoom()
|
|||
current_link = Null;
|
||||
GoTo0(topic);
|
||||
Refresh();
|
||||
SetBar();
|
||||
}
|
||||
|
||||
void HelpWindow::FontSize()
|
||||
|
|
@ -130,7 +131,7 @@ void HelpWindow::Tools(Bar& bar)
|
|||
bar.Add(forward.GetCount(), t_("Go Forward"), CtrlImg::go_forward(), THISBACK(Forward))
|
||||
.Key(K_ALT_RIGHT);
|
||||
bar.Gap();
|
||||
bar.Add(t_("Font size"), CtrlImg::font_size(), THISBACK(FontSize));
|
||||
bar.Add(t_("Font size"), MakeZoomIcon(zoom.m / 160.0), THISBACK(FontSize));
|
||||
bar.Gap();
|
||||
#ifndef PLATFORM_PDA
|
||||
bar.Add(t_("Print"), CtrlImg::print(), THISBACK(Print));
|
||||
|
|
|
|||
|
|
@ -17,12 +17,10 @@ IconDes::TextDlg::TextDlg()
|
|||
face.Add(i);
|
||||
SetupFaceList(face);
|
||||
face <<= Font::ARIAL;
|
||||
height.MinMax(6, 100);
|
||||
height.MinMax(4, 100);
|
||||
height <<= 12;
|
||||
|
||||
for(int i = 4; i < 100; i += i < 16 ? 1 : i < 32 ? 4 : i < 48 ? 8 : 16)
|
||||
height.AddList(i);
|
||||
height <<= 12;
|
||||
}
|
||||
|
||||
Font IconDes::TextDlg::GetFont()
|
||||
|
|
|
|||
|
|
@ -38,9 +38,8 @@ IMAGE_ID(Id)
|
|||
IMAGE_ID(Context)
|
||||
IMAGE_ID(Members)
|
||||
IMAGE_ID(ImageError)
|
||||
IMAGE_ID(Zoom1)
|
||||
IMAGE_ID(Zoom2)
|
||||
IMAGE_ID(Zoom3)
|
||||
IMAGE_ID(Numbers1)
|
||||
IMAGE_ID(Numbers2)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,89,59,114,227,48,12,213,236,236,1,114,132,189,195,214,137,114,2,119,185,131,143,225,163,164,118,229,35,184)
|
||||
|
|
@ -102,40 +101,40 @@ IMAGE_DATA(180,212,62,234,191,85,231,60,37,252,0,90,155,6,123,0,0,0,0,0,0,0,0,0,
|
|||
IMAGE_END_DATA(672, 16)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,89,189,107,20,65,20,127,32,90,168,132,43,76,33,132,96,17,8,92,56,12,34,118,114,32,216,42,22,135)
|
||||
IMAGE_DATA(109,10,43,11,11,11,203,219,5,49,104,101,64,17,76,37,104,113,217,66,176,80,236,114,133,24,172,210,108,145,127,65)
|
||||
IMAGE_DATA(4,177,178,29,239,237,222,187,157,125,247,102,118,102,103,115,119,194,189,227,49,183,179,239,247,190,231,237,38,7,45,104)
|
||||
IMAGE_DATA(129,138,96,76,145,2,136,107,50,97,203,20,3,76,237,201,20,55,141,87,2,123,225,117,34,124,108,88,9,143,215,227)
|
||||
IMAGE_DATA(189,90,248,80,251,13,198,47,145,69,103,129,55,251,40,199,20,130,143,39,249,110,206,126,104,252,85,20,139,181,104,2)
|
||||
IMAGE_DATA(31,120,126,203,195,160,17,146,18,230,211,152,106,56,28,90,217,5,191,189,253,71,237,237,29,215,198,35,214,164,195,213)
|
||||
IMAGE_DATA(127,210,49,24,28,121,225,203,220,237,98,15,231,171,235,193,230,84,210,81,147,106,235,48,196,162,20,187,111,196,235,185)
|
||||
IMAGE_DATA(195,156,230,88,149,93,15,6,3,47,60,214,67,199,251,212,51,164,31,67,240,142,28,78,52,12,206,142,62,126,84,42)
|
||||
IMAGE_DATA(104,77,108,221,6,85,170,204,190,58,184,253,34,142,56,30,61,221,53,198,98,241,189,178,14,242,199,23,207,227,105,6)
|
||||
IMAGE_DATA(95,143,10,252,206,206,78,214,92,180,162,61,190,87,198,78,245,193,164,65,91,173,86,134,199,21,166,26,215,88,191,146)
|
||||
IMAGE_DATA(189,113,188,220,135,83,163,122,249,95,28,124,16,53,253,102,48,239,100,204,53,153,57,133,54,115,208,97,106,224,48,215)
|
||||
IMAGE_DATA(9,121,97,134,97,232,48,119,35,243,195,196,141,154,126,152,213,33,193,111,28,6,205,147,92,28,247,131,217,28,62,212)
|
||||
IMAGE_DATA(255,122,62,44,22,222,159,166,241,220,166,238,203,255,128,119,35,126,72,149,104,139,215,161,192,235,135,52,63,168,126,120)
|
||||
IMAGE_DATA(93,71,126,200,253,241,1,116,10,255,51,104,130,248,147,176,138,167,240,239,214,64,29,175,8,213,29,51,222,67,25,19)
|
||||
IMAGE_DATA(30,239,191,89,151,117,232,247,76,120,181,186,42,234,224,123,70,252,214,86,73,254,215,185,156,185,62,35,126,109,109,34)
|
||||
IMAGE_DATA(131,184,103,27,57,227,119,61,22,35,94,227,16,124,109,255,13,53,112,205,95,104,253,66,251,199,147,23,131,46,142,62)
|
||||
IMAGE_DATA(115,24,6,214,131,108,193,204,106,191,3,213,197,82,14,223,235,202,115,219,46,254,204,159,102,220,76,122,82,58,14,242)
|
||||
IMAGE_DATA(36,71,56,0,123,50,109,133,225,247,93,154,153,219,175,146,231,241,153,252,239,176,239,29,134,209,101,76,177,47,94,83)
|
||||
IMAGE_DATA(217,94,83,218,109,232,197,49,40,92,93,245,233,24,92,211,20,255,136,46,174,171,116,161,204,201,9,168,36,1,213,239)
|
||||
IMAGE_DATA(227,239,82,249,138,215,184,143,247,171,236,235,178,100,159,116,218,236,147,143,81,148,99,54,55,225,142,190,162,31,54,251)
|
||||
IMAGE_DATA(100,15,125,38,187,196,180,143,28,65,148,113,27,218,61,31,251,180,223,135,190,74,147,52,211,225,27,127,154,38,234,160)
|
||||
IMAGE_DATA(119,144,97,81,143,45,255,104,143,231,63,73,122,147,223,9,37,188,84,127,196,160,221,252,58,153,224,37,255,37,93,25)
|
||||
IMAGE_DATA(166,215,43,191,42,56,224,179,120,32,86,38,242,194,243,87,149,25,217,71,25,212,33,177,11,222,139,46,140,158,44,133)
|
||||
IMAGE_DATA(225,108,46,100,28,11,28,9,156,140,138,244,51,77,75,65,226,53,238,115,89,46,167,203,115,89,218,127,221,110,79,236)
|
||||
IMAGE_DATA(152,100,117,159,201,31,201,7,61,14,73,46,54,200,146,223,228,11,207,135,126,93,20,90,206,157,148,87,83,158,235,232)
|
||||
IMAGE_DATA(117,145,53,229,132,243,208,241,191,91,145,198,93,199,190,67,185,195,17,171,241,74,120,122,172,218,94,118,186,21,50,164)
|
||||
IMAGE_DATA(251,208,130,117,241,83,210,113,232,136,149,228,201,54,163,120,127,20,202,40,150,31,39,0,183,238,176,155,145,230,3,229)
|
||||
IMAGE_DATA(136,209,165,13,128,171,55,0,30,238,26,124,32,155,6,252,249,203,0,187,7,150,24,116,188,144,211,151,31,114,29,72)
|
||||
IMAGE_DATA(119,31,176,155,60,102,22,63,250,142,177,19,95,225,175,155,220,103,83,93,37,50,213,218,69,71,85,159,80,239,242,158)
|
||||
IMAGE_DATA(143,180,123,212,219,54,27,122,207,235,103,65,183,225,26,175,205,207,96,29,203,97,80,57,12,240,16,232,205,140,135,210)
|
||||
IMAGE_DATA(40,47,12,131,245,155,185,14,228,228,187,224,131,195,48,64,122,245,30,224,218,109,67,28,21,195,0,113,79,247,13,88)
|
||||
IMAGE_DATA(142,103,249,56,179,2,48,56,202,87,36,60,220,37,170,24,6,104,247,227,151,60,119,47,222,230,249,40,209,114,24,44)
|
||||
IMAGE_DATA(135,193,172,134,193,243,207,229,195,140,127,2,220,127,60,150,117,24,6,215,239,21,223,241,201,252,233,155,69,94,24,6)
|
||||
IMAGE_DATA(68,248,68,252,253,87,56,76,142,195,0,223,42,38,126,115,170,24,6,232,247,215,99,3,150,227,89,62,208,111,204,153)
|
||||
IMAGE_DATA(254,68,167,193,144,81,197,48,64,191,249,27,205,182,254,118,97,25,6,136,67,219,122,253,112,160,60,122,194,108,47,135)
|
||||
IMAGE_DATA(65,3,58,254,1,54,223,8,75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1152, 13)
|
||||
IMAGE_DATA(120,156,213,89,189,110,219,48,16,190,165,69,129,22,133,151,108,65,167,2,41,28,24,72,215,160,64,222,160,155,247,76)
|
||||
IMAGE_DATA(126,140,88,75,119,15,69,231,142,142,31,192,115,50,117,204,226,33,128,159,160,232,210,55,96,125,146,206,58,125,62,82)
|
||||
IMAGE_DATA(164,168,36,238,25,7,138,228,125,247,79,202,137,105,68,35,114,115,170,105,238,136,138,158,44,216,54,21,68,7,107,54)
|
||||
IMAGE_DATA(21,67,227,157,193,73,120,77,130,47,60,163,224,121,94,175,245,194,231,218,31,48,126,139,2,58,27,188,223,71,59,166)
|
||||
IMAGE_DATA(28,124,177,207,247,112,246,115,227,239,162,194,172,197,16,248,204,243,219,190,12,6,33,43,97,41,141,233,238,238,238,130)
|
||||
IMAGE_DATA(28,131,191,184,248,235,22,139,135,222,120,198,250,116,196,250,47,58,150,203,95,73,248,54,95,93,113,15,87,99,236,193)
|
||||
IMAGE_DATA(70,106,233,232,73,189,117,120,98,113,14,246,189,120,157,59,206,105,133,117,229,124,185,92,38,225,185,30,26,159,82,207)
|
||||
IMAGE_DATA(156,126,204,193,71,114,62,201,101,240,106,247,73,163,86,65,123,98,251,54,168,115,109,78,213,129,246,155,56,138,98,247)
|
||||
IMAGE_DATA(118,87,204,197,194,181,182,14,241,39,21,143,241,12,131,239,71,13,254,250,250,186,108,46,25,217,30,174,181,177,7,125)
|
||||
IMAGE_DATA(176,111,208,209,104,84,226,121,164,131,198,245,214,175,101,175,142,23,125,120,50,234,151,255,227,193,103,209,208,223,12,94)
|
||||
IMAGE_DATA(58,25,47,154,204,138,114,155,57,235,48,13,112,152,251,132,124,52,151,97,238,101,30,71,254,151,73,28,13,253,50,235)
|
||||
IMAGE_DATA(67,134,223,124,25,12,79,118,113,226,15,230,112,248,92,255,251,249,112,92,248,116,58,196,163,77,237,203,255,128,143,35)
|
||||
IMAGE_DATA(60,164,206,180,133,117,104,240,250,144,86,7,53,13,175,117,84,135,60,29,159,65,79,240,63,131,33,8,223,132,93,124)
|
||||
IMAGE_DATA(128,255,121,74,238,225,189,81,221,154,121,143,101,124,120,222,255,241,193,214,161,247,124,120,119,114,98,234,192,53,47,254)
|
||||
IMAGE_DATA(252,188,37,255,231,117,197,168,207,139,63,61,221,203,48,238,219,199,138,249,89,199,226,197,43,206,193,247,246,223,83,131)
|
||||
IMAGE_DATA(216,252,229,214,47,183,127,18,249,56,232,221,238,243,2,151,65,240,32,7,48,207,181,62,161,238,98,185,136,231,190,242)
|
||||
IMAGE_DATA(104,59,198,159,151,167,103,110,38,157,148,73,132,188,200,9,142,40,156,204,80,97,112,63,166,153,209,126,151,60,198,231)
|
||||
IMAGE_DATA(243,127,2,207,19,192,104,25,95,236,199,215,84,161,175,41,227,49,77,139,130,28,143,177,250,52,134,199,205,134,255,136)
|
||||
IMAGE_DATA(110,230,93,186,88,230,241,145,220,106,69,238,230,134,127,151,170,70,158,243,58,239,119,217,215,178,98,95,116,134,236,139)
|
||||
IMAGE_DATA(143,243,121,133,57,59,163,175,122,100,63,66,246,197,30,251,44,118,133,101,157,121,78,243,146,199,52,158,166,216,151,245)
|
||||
IMAGE_DATA(27,186,113,155,213,166,212,145,26,255,102,179,114,183,211,219,18,203,122,66,249,103,123,152,255,213,106,186,255,157,208,194)
|
||||
IMAGE_DATA(91,245,103,12,219,173,230,171,61,222,242,223,210,85,98,166,211,246,87,133,8,124,25,15,21,206,71,73,120,252,170,242)
|
||||
IMAGE_DATA(76,246,89,134,117,88,28,131,79,162,183,187,55,75,99,184,188,23,74,46,12,158,27,188,218,21,233,247,102,211,10,146)
|
||||
IMAGE_DATA(231,188,142,178,40,167,229,81,86,214,191,143,199,123,59,62,89,237,179,248,99,249,160,227,176,228,10,143,172,248,45,190)
|
||||
IMAGE_DATA(96,62,244,188,41,180,157,59,43,175,190,60,247,209,27,35,235,203,9,242,253,39,122,173,123,229,243,142,93,61,226,26)
|
||||
IMAGE_DATA(213,163,222,199,185,150,213,251,14,246,81,31,238,163,62,109,143,12,121,60,49,190,121,172,156,38,140,63,117,196,156,160)
|
||||
IMAGE_DATA(157,80,124,177,249,142,205,87,76,30,176,254,150,63,93,249,197,248,125,114,86,63,132,252,179,124,11,201,199,248,23,146)
|
||||
IMAGE_DATA(195,117,235,124,32,206,234,239,46,249,174,250,81,96,127,63,191,255,66,111,64,158,46,119,188,173,133,214,176,55,51,12)
|
||||
IMAGE_DATA(200,26,202,251,214,133,22,181,29,61,215,201,152,169,189,181,90,191,172,217,1,139,46,237,191,214,175,253,89,128,238,153)
|
||||
IMAGE_DATA(241,172,229,133,46,33,150,45,96,45,157,218,167,109,64,70,104,161,116,73,172,72,26,171,125,88,80,19,155,228,10,101)
|
||||
IMAGE_DATA(116,60,51,58,172,141,117,161,117,249,188,133,245,45,53,49,107,172,21,203,214,88,211,100,233,145,24,37,94,172,139,196)
|
||||
IMAGE_DATA(133,88,156,51,133,226,149,56,244,28,251,71,231,28,253,196,222,20,153,181,90,199,156,248,122,7,245,232,250,174,41,63)
|
||||
IMAGE_DATA(94,157,87,36,169,47,234,67,91,90,151,248,163,207,114,76,191,137,173,25,29,246,182,62,191,107,3,31,219,207,107,67)
|
||||
IMAGE_DATA(78,147,232,193,59,201,122,145,161,93,188,47,240,14,90,195,62,206,173,243,48,163,166,54,190,251,74,8,253,91,27,58)
|
||||
IMAGE_DATA(209,174,175,246,250,78,197,59,115,97,60,235,186,200,28,245,234,190,213,242,18,135,228,192,58,119,232,179,174,137,238,55)
|
||||
IMAGE_DATA(235,189,176,0,89,139,124,239,35,148,183,206,163,96,48,94,253,30,241,221,15,101,236,255,0,94,19,63,15,0,0,0)
|
||||
IMAGE_END_DATA(1152, 12)
|
||||
|
|
|
|||
|
|
@ -173,30 +173,9 @@ void LayDes::GotoUsing()
|
|||
TheIde()->FindDesignerItemReferences(CurrentLayout().name + "__layid", "With" + CurrentLayout().name);
|
||||
}
|
||||
|
||||
struct MakeZoomIcon : ImageMaker {
|
||||
double zoom;
|
||||
|
||||
String Key() const override {
|
||||
return String((byte *)&zoom, sizeof(zoom));
|
||||
}
|
||||
Image Make() const override {
|
||||
Size sz(DPI(16), DPI(16));
|
||||
ImagePainter w(sz);
|
||||
w.Clear(RGBAZero());
|
||||
w.Move(DPI(11), DPI(11)).Line(DPI(16), DPI(16)).Stroke(DPI(2), SBlack());
|
||||
w.Circle(DPI(7), DPI(7), DPI(6)).Stroke(DPI(2), SBlack());
|
||||
Font fnt = Arial((int)DPI(7) * zoom);
|
||||
Size tsz = GetTextSize("Z", fnt);
|
||||
w.DrawText(DPI(7) - tsz.cx / 2, DPI(7) - tsz.cy / 2, "Z", fnt, SLtBlue());
|
||||
return w;
|
||||
}
|
||||
};
|
||||
|
||||
void LayDes::OptionBar(Bar& bar)
|
||||
{
|
||||
MakeZoomIcon im;
|
||||
im.zoom = GetScale();
|
||||
bar.Add("Zoom " + AsString(GetScale() * 100) + "%", MakeImage(im),
|
||||
bar.Add("Zoom " + AsString(GetScale() * 100) + "%", MakeZoomIcon(GetScale()),
|
||||
[=] {
|
||||
Zoom = Zoom < 5 ? 5 : Zoom < 10 ? 10 : 0;
|
||||
Refresh();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue