mirror of
https://github.com/VincentWei/MiniGUI.git
synced 2026-09-25 11:07:54 +08:00
tune CB_GLYPH_LAID_OUT
This commit is contained in:
+2
-2
@@ -12807,8 +12807,8 @@ MG_EXPORT LAYOUTINFO* GUIAPI CreateLayoutInfo(
|
||||
MG_EXPORT BOOL GUIAPI DestroyLayoutInfo(LAYOUTINFO* layout_info);
|
||||
|
||||
typedef BOOL (*CB_GLYPH_LAID_OUT) (GHANDLE ctxt,
|
||||
const TEXTRUNSINFO *truninfo, int uc_index, LOGFONT* lf,
|
||||
Uchar32 uc, Glyph32 gv, const GLYPHPOS* pos);
|
||||
const TEXTRUNSINFO *truninfo, int uc_index,
|
||||
Uchar32 uc, LOGFONT* lf, Glyph32 gv, const GLYPHPOS* pos);
|
||||
|
||||
/**
|
||||
* \fn LAYOUTLINE* GUIAPI LayoutNextLine(LAYOUTINFO* layout_info,
|
||||
|
||||
@@ -146,10 +146,8 @@ LayoutRun* __mg_layout_run_new_orphan(const LAYOUTINFO* layout,
|
||||
lrun = malloc(sizeof(LayoutRun));
|
||||
lrun->lf = lf;
|
||||
lrun->ucs = ucs;
|
||||
lrun->si = 0;
|
||||
lrun->len = nr_ucs;
|
||||
lrun->si = trun->si;
|
||||
lrun->len = trun->len;
|
||||
lrun->len = nr_ucs;
|
||||
lrun->lc = trun->lc;
|
||||
lrun->st = UCharGetScriptType(ucs[0]);
|
||||
lrun->el = trun->el;
|
||||
|
||||
@@ -1660,7 +1660,6 @@ static int traverse_line_glyphs(const LAYOUTINFO* layout,
|
||||
ShapedGlyph* glyph_info;
|
||||
|
||||
uc = run->lrun->ucs[run->gstr->log_clusters[j]];
|
||||
|
||||
index = run->lrun->si + run->gstr->log_clusters[j];
|
||||
glyph_info = run->gstr->glyphs + j;
|
||||
|
||||
@@ -1683,8 +1682,8 @@ static int traverse_line_glyphs(const LAYOUTINFO* layout,
|
||||
}
|
||||
}
|
||||
|
||||
cb_laid_out(ctxt, layout->truninfo, index, run->lrun->lf,
|
||||
uc, glyph_info->gv, &pos);
|
||||
cb_laid_out(ctxt, layout->truninfo, index, uc,
|
||||
run->lrun->lf, glyph_info->gv, &pos);
|
||||
|
||||
line_adv += glyph_info->width;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user