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

CtrlLib: fixed font height issue

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5418 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-10-08 16:05:09 +00:00
parent 587887a70f
commit be65f52791
2 changed files with 520 additions and 520 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/CtrlLib/EditField.cpp
View file

@ -206,7 +206,7 @@ int EditField::GetViewHeight(Font font)
{
Size sz(0, 0);
EditFieldFrame().FrameAddSize(sz);
return font.GetHeight() + (sz.cy <= 2 ? 4 : sz.cy <= 4 ? 2 : 0);
return font.GetCy() + (sz.cy <= 2 ? 4 : sz.cy <= 4 ? 2 : 0);
}
int EditField::GetStdHeight(Font font)
@ -218,7 +218,7 @@ int EditField::GetStdHeight(Font font)
Size EditField::GetMinSize() const
{
return AddFrameSize(10, font.GetHeight() + 4);
return AddFrameSize(10, font.GetCy() + 4);
}
int EditField::GetCursor(int posx)
@ -250,7 +250,7 @@ Image EditField::CursorImage(Point, dword)
int EditField::GetTy() const
{
return (GetSize().cy + 1 - font.GetHeight()) / 2;
return (GetSize().cy + 1 - font.GetCy()) / 2;
}
void EditField::HighlightText(Vector<Highlight>& hl)
@ -296,7 +296,7 @@ void EditField::Paint(Draw& w)
Color ink = enabled ? style->text : style->textdisabled;
if(enabled && (convert && convert->Scan(text).IsError() || errorbg))
paper = style->invalid;
int fcy = font.GetHeight();
int fcy = font.GetCy();
int yy = GetTy();
w.DrawRect(0, 0, 2, sz.cy, paper);
w.DrawRect(0, 0, sz.cx, yy, paper);
@ -385,7 +385,7 @@ bool EditField::IsSelection() const
Rect EditField::GetCaretRect(int pos) const
{
return RectC(GetCaret(pos) - sc + 2 - font.GetRightSpace('o') + font.GetLeftSpace('o'), GetTy(),
1, min(GetSize().cy - 2 * GetTy(), font.GetHeight()));
1, min(GetSize().cy - 2 * GetTy(), font.GetCy()));
}
void EditField::SyncCaret()
@ -703,7 +703,7 @@ void EditField::DragAndDrop(Point p, PasteClip& d)
if(c >= 0) {
int x = GetCaret(c);
dc = RectC(x - sc + 2 - font.GetRightSpace('o'), GetTy(),
1, min(GetSize().cy - 2 * GetTy(), font.GetHeight()));
1, min(GetSize().cy - 2 * GetTy(), font.GetCy()));
}
if(dc != dropcaret) {
Refresh(dropcaret);

1028
uppsrc/Draw/Font.cpp
View file

File diff suppressed because it is too large Load diff