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

RichText: ToImage ink now has default, ide: cosmetics

Browse source
This commit is contained in:
Mirek Fidler 2025-05-04 17:54:32 +02:00
parent 989bcd55d2
commit 70d3a6e3f0
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/RichText/RichText.h
View file

@ -198,7 +198,7 @@ public:
void SetSize(Size sz) { SetSize(sz.cx, sz.cy); }
Size GetSize() const { return size; }
void Paint(Draw& w, Size sz, Color ink, void *context = NULL) const;
Image ToImage(Size sz, Color ink, void *context = NULL) const;
Image ToImage(Size sz, Color ink = Black(), void *context = NULL) const;
Size GetPhysicalSize() const { return physical_size; }
Size GetPixelSize() const { return pixel_size; }
Size GetDefaultSize(Size maxsize, void *context = NULL) const { return type ? type->GetDefaultSize(data, maxsize, context) : physical_size; }

4
uppsrc/ide/LayDes/laylib.cpp
View file

@ -399,10 +399,6 @@ void EscDraw::DrawLabel(EscEscape& e)
{ // DrawLabel(x, y, cx, cy, text, font, ink, align, valign, orientation)
if(e.GetCount() < 5 || e.GetCount() > 10)
e.ThrowError("wrong number of arguments in call to 'DrawLabel'");
int x = e.Int(0);
int y = e.Int(1);
int cx = e.Int(2);
int cy = e.Int(3);
Upp::DrawLabel dl;
int ii = 4;