github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed LayDes Lbl/Var popup wrong size issue

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12656 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-01-09 10:58:40 +00:00
parent 41b2aa9068
commit cb7386bb8a
3 changed files with 32 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/uhdtodo.txt
View file

@ -3,7 +3,6 @@ UHD
IconDes paste over
CheckBox in layout designer
Left-right cursor image weird miniborder (OpenWind only)
GTK is total mess, question is whether we should fix it...
------------------------------------
Progress cutoff of text
@ -28,3 +27,4 @@ SetLabel for switch is too small (scale usc number)
Nos Galerie CheckBox
Non-UHD testing mode
Select product Nos icons
GTK is total mess, question is whether we should fix it...

3
uppsrc/CtrlLib/DisplayPopup.cpp
View file

@ -14,7 +14,6 @@ void DisplayPopup::LeftDown(Point p, dword flags)
void DisplayPopup::LeftDrag(Point p, dword flags)
{
DLOG("LeftDrag");
ctrl->LeftDrag(Op(p), flags);
}
@ -54,8 +53,6 @@ void DisplayPopup::Paint(Draw& w)
{
Rect r = GetSize();
w.DrawRect(r, SColorPaper);
DDUMP(display);
DDUMP(value);
if(display) {
display->PaintBackground(w, r, value, ink, paper, style);
r.left += margin;

75
uppsrc/ide/LayDes/laydes.cpp
View file

@ -363,56 +363,43 @@ Ctrl::LogPos MakeLogPos(Ctrl::LogPos p, const Rect& r, Size sz)
struct IDisplay : public Display {
Color paper, ink;
Font font;
Size GetStdSize(const Value& q) const {
Size sz = GetSmartTextSize(~q, font);
sz.cx += 2 * DPI(4);
return sz;
}
void Paint(Draw& w, const Rect& r, const Value& q,
Color, Color, dword s) const {
w.DrawRect(r, paper);
DrawSmartText(w, r.left + 8, r.top, r.Width(),
String(IsString(q) ? q : StdConvert().Format(q)), StdFont(), ink);
DrawSmartText(w, r.left + DPI(4), r.top, r.Width(), ~q, font, ink);
}
IDisplay(Color paper, Color ink)
: paper(paper), ink(ink) {}
IDisplay(Color paper, Color ink, Font font = StdFont())
: paper(paper), ink(ink), font(font) {}
};
struct TDisplay : public Display {
Color paper, ink;
Font font;
Size GetStdSize(const Value& q) const {
Size sz = GetSmartTextSize(~q, font);
sz.cx += 2 * DPI(4) + DPI(6) + sz.cy * 8 / 3;
return sz;
}
void Paint(Draw& w, const Rect& r, const Value& q,
Color, Color, dword s) const {
w.DrawRect(r, paper);
int dx = r.Height() * 8 / 3;
Image icon = GetTypeIcon(String(q), dx, r.Height(), 1, paper);
w.DrawImage(r.left + 8, r.top + (r.Height() - icon.GetSize().cy) / 2, icon);
DrawSmartText(w, r.left + dx + 12, r.top, r.Width(), String(q), StdFont(), ink);
w.DrawImage(r.left + DPI(4), r.top + (r.Height() - icon.GetSize().cy) / 2, icon);
DrawSmartText(w, r.left + dx + DPI(6), r.top, r.Width(), ~q, font, ink);
}
TDisplay(Color paper, Color ink)
: paper(paper), ink(ink) {}
};
struct IDisplayH : public Display {
Color paper, ink;
void Paint(Draw& w, const Rect& r, const Value& q,
Color, Color, dword s) const {
w.DrawRect(r, paper);
DrawSmartText(w, r.left + 8, r.top, r.Width(),
String(IsString(q) ? q : StdConvert().Format(q)), StdFont().Italic(), ink);
}
IDisplayH(Color paper, Color ink)
: paper(paper), ink(ink) {}
};
struct TDisplayH : public Display {
Color paper, ink;
void Paint(Draw& w, const Rect& r, const Value& q,
Color, Color, dword s) const {
w.DrawRect(r, paper);
int dx = r.Height() * 8 / 3;
Image icon = GetTypeIcon(String(q), dx, r.Height(), 1, paper);
w.DrawImage(r.left + 8, r.top + (r.Height() - icon.GetSize().cy) / 2, icon);
DrawSmartText(w, r.left + dx + 12, r.top, r.Width(), String(q), StdFont().Italic(), ink);
}
TDisplayH(Color paper, Color ink)
: paper(paper), ink(ink) {}
TDisplay(Color paper, Color ink, Font font = StdFont())
: paper(paper), ink(ink), font(font) {}
};
void LayDes::SyncItems()
@ -438,15 +425,15 @@ void LayDes::SyncItems()
void LayDes::SyncItem(int i, int style)
{
if(CurrentLayout().item[i].hide) {
static IDisplayH dnormal(SColorPaper, SColorText);
static IDisplayH dselect(SColorLtFace, SColorText);
static IDisplayH dcursor(SColorFace, SColorText);
static TDisplayH tnormal(SColorPaper, SColorText);
static TDisplayH tselect(SColorLtFace, SColorText);
static TDisplayH tcursor(SColorFace, SColorText);
static IDisplayH lnormal(SColorPaper, Green);
static IDisplayH lselect(SColorLtFace, Green);
static IDisplayH lcursor(SColorFace, Green);
static IDisplay dnormal(SColorPaper, SColorText, StdFont().Italic());
static IDisplay dselect(SColorLtFace, SColorText, StdFont().Italic());
static IDisplay dcursor(SColorFace, SColorText, StdFont().Italic());
static TDisplay tnormal(SColorPaper, SColorText, StdFont().Italic());
static TDisplay tselect(SColorLtFace, SColorText, StdFont().Italic());
static TDisplay tcursor(SColorFace, SColorText, StdFont().Italic());
static IDisplay lnormal(SColorPaper, Green, StdFont().Italic());
static IDisplay lselect(SColorLtFace, Green, StdFont().Italic());
static IDisplay lcursor(SColorFace, Green, StdFont().Italic());
const Display *noicon[] = { &dnormal, &dselect, &dcursor };
const Display *isicon[] = { &tnormal, &tselect, &tcursor };
const Display *label[] = { &lnormal, &lselect, &lcursor };