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

RichText: '[g ' now sets standard GUI font with *standard size*

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7619 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-08-29 11:07:07 +00:00
parent 1ecfcf5258
commit 8f28c30c7b
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/RichText/ParaPaint.cpp
View file

@ -50,6 +50,8 @@ void RichPara::Flush(Draw& draw, const PaintInfo& pi, wchar *text,
draw.DrawRect(zx0, z * y, width, z * (y + linecy) - z * y,
pi.coloroverride ? SColorPaper() : f.paper);
Font fnt = f;
DDUMP(fnt.GetFaceName());
DDUMP(fnt.GetCy());
int zht = z * tabs(f.GetHeight());
int ssa = 0;
int ssd = 0;

20
uppsrc/RichText/ParseQtf.cpp
View file

@ -550,6 +550,22 @@ void RichQtfParser::Cat(int chr)
extern bool s_nodeqtf[128];
int GetRichTextScreenStdFontHeight()
{
static int gh = 67;
ONCELOCK {
for(int i = 0; i < 1000; i++) {
int h = GetRichTextStdScreenZoom() * i;
LOG(i << ' ' << StdFont(h).GetCy());
if(h > 0 && StdFont(h).GetCy() == StdFont().GetCy()) {
gh = i;
break;
}
}
}
return gh;
}
void RichQtfParser::Parse(const char *qtf, int _accesskey)
{
accesskey = _accesskey;
@ -661,6 +677,10 @@ void RichQtfParser::Parse(const char *qtf, int _accesskey)
}
break;
}
case 'g':
format.Face(Font::STDFONT);
format.Height(GetRichTextScreenStdFontHeight());
break;
default:
if(c >= '0' && c <= '9') {
format.Height(QTFFontHeight[c - '0']);

2
uppsrc/RichText/srcdoc.tpp/QTF$en-us.tpp
View file

@ -227,6 +227,8 @@ matching&]
::= [s0; Courier font.]
::^ [s0;%- [C@(128.0.255) G]]
::= [s0; Standard GUI font.]
::^ [s0;%- [C@(128.0.255) g]]
::= [s0; Standard GUI font with standard height.]
::^ [s0;%- [C@(128.0.255) S]]
::= [s0; Symbol font.]
::^ [s0;%- [C@(128.0.255) .][/C@(0.0.255) number]]