jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix drawTextContent

Browse Source
This commit is contained in:
ckcz123 2020-10-30 22:49:02 +08:00
parent 7117c975c3
commit e6070da8b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ui.js
View File

@ -1048,7 +1048,7 @@ ui.prototype.drawTextContent = function (ctx, content, config) {
var globalAttribute = core.status.globalAttribute || core.initStatus.globalAttribute; var globalAttribute = core.status.globalAttribute || core.initStatus.globalAttribute;
config = core.clone(config || {}); config = core.clone(config || {});
config.left = config.left || 0; config.left = config.left || 0;
config.right = config.left + (config.maxWidth == null ? (ctx != null ? ctx.canvas.width : core.__PIXELS__) : config.maxWidth) config.right = config.left + (config.maxWidth == null ? core.__PIXELS__ : config.maxWidth)
config.top = config.top || 0; config.top = config.top || 0;
config.color = core.arrayToRGBA(config.color || textAttribute.text); config.color = core.arrayToRGBA(config.color || textAttribute.text);
if (config.bold == null) config.bold = textAttribute.bold; if (config.bold == null) config.bold = textAttribute.bold;
@ -1175,8 +1175,8 @@ ui.prototype._drawTextContent_drawChar = function (tempCtx, content, config, ch)
if (c == 'z') return this._drawTextContent_emptyChar(tempCtx, content, config); if (c == 'z') return this._drawTextContent_emptyChar(tempCtx, content, config);
} }
// 检查是不是自动换行 // 检查是不是自动换行
if (config.maxWidth != null) {
var charwidth = core.calWidth(tempCtx, ch) + config.interval; var charwidth = core.calWidth(tempCtx, ch) + config.interval;
if (config.maxWidth != null) {
if (config.offsetX + charwidth > config.maxWidth) { if (config.offsetX + charwidth > config.maxWidth) {
// --- 当前应当换行，然而还是检查一下是否是forbidStart // --- 当前应当换行，然而还是检查一下是否是forbidStart
if (!config.forceChangeLine && forbidStart.indexOf(ch) >= 0) { if (!config.forceChangeLine && forbidStart.indexOf(ch) >= 0) {