浏览代码

Remove getTextStyle.

/main
Yuncong Zhang 5 年前
当前提交
322f8b7a
共有 1 个文件被更改,包括 13 次插入11 次删除
  1. 24
      Runtime/ui/txt/paragraph.cs

24
Runtime/ui/txt/paragraph.cs


float maxLineSpacing = 0;
float maxDescent = 0;
void updateLineMetrics(FontMetrics metrics, TextStyle style) {
void updateLineMetrics(FontMetrics metrics, float styleHeight) {
? -metrics.ascent * style.height
: (-metrics.ascent + metrics.leading) * style.height;
? -metrics.ascent * styleHeight
: (-metrics.ascent + metrics.leading) * styleHeight;
(metrics.underlinePosition ?? 0.0f - metrics.ascent) * style.height;
(metrics.underlinePosition ?? 0.0f - metrics.ascent) * styleHeight;
float descent = metrics.descent * style.height;
float descent = metrics.descent * styleHeight;
updateLineMetrics(paintRecord.metrics, paintRecord.style);
updateLineMetrics(paintRecord.metrics, paintRecord.style.height);
var defaultStyle = this._paragraphStyle.getTextStyle();
var defaultFont = FontManager.instance.getOrCreate(defaultStyle.fontFamily,
defaultStyle.fontWeight, defaultStyle.fontStyle).font;
var metrics = FontMetrics.fromFont(defaultFont, defaultStyle.UnityFontSize);
updateLineMetrics(metrics, defaultStyle);
// TODO: the default values are filled in directly, to avoid the cost of creating a new TextStyle
// However this may become inconsistent with the default values in TextStyle (text.cs)
// A better way is to define some global constants used in both places.
var defaultFont = FontManager.instance.getOrCreate(this._paragraphStyle.fontFamily ?? "Helvetica",
this._paragraphStyle.fontWeight ?? FontWeight.w400, this._paragraphStyle.fontStyle ?? FontStyle.normal).font;
var metrics = FontMetrics.fromFont(defaultFont, (int) (this._paragraphStyle.fontSize ?? 14.0f));
updateLineMetrics(metrics, this._paragraphStyle.lineHeight ?? 1.0f);
}
this._lineHeights.Add(

正在加载...
取消
保存