From ac10928ad55a8a799e47a9b7bfe3b8a484bc74be Mon Sep 17 00:00:00 2001 From: pandamicro Date: Fri, 22 Sep 2017 10:23:04 +0800 Subject: [PATCH] Revert "web UIButton support BMFont" --- extensions/ccui/uiwidgets/UIButton.js | 28 +++++++-------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/extensions/ccui/uiwidgets/UIButton.js b/extensions/ccui/uiwidgets/UIButton.js index 1c3f102a4f..4741e2e767 100644 --- a/extensions/ccui/uiwidgets/UIButton.js +++ b/extensions/ccui/uiwidgets/UIButton.js @@ -100,22 +100,12 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ } }, - _createTitleRendererIfNeeded: function (fntFile) { + _createTitleRendererIfNeeded: function ( ) { if(!this._titleRenderer) { - if(fntFile != null) - { - this._titleRenderer = new cc.LabelBMFont("", fntFile); - this._titleRenderer.setAlignment(cc.TEXT_ALIGNMENT_CENTER); - } - else - { - this._titleRenderer = new cc.LabelTTF(""); - this._titleRenderer.setVerticalAlignment(cc.VERTICAL_TEXT_ALIGNMENT_CENTER); - } - - this._titleRenderer.setAnchorPoint(0.5, 0.4); + this._titleRenderer = new cc.LabelTTF(""); + this._titleRenderer.setAnchorPoint(0.5, 0.5); this._titleColor = cc.color.WHITE; - + this._titleRenderer.setVerticalAlignment(cc.VERTICAL_TEXT_ALIGNMENT_CENTER); this.addProtectedChild(this._titleRenderer, ccui.Button.TITLE_RENDERER_ZORDER, -1); } }, @@ -667,11 +657,7 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ setTitleFontSize: function (size) { this._createTitleRendererIfNeeded(); - if(this._titleRenderer.setFontSize) - this._titleRenderer.setFontSize(size); - else - this._titleRenderer.setBoundingWidth(size); - + this._titleRenderer.setFontSize(size); this._fontSize = size; }, @@ -719,9 +705,9 @@ ccui.Button = ccui.Widget.extend(/** @lends ccui.Button# */{ * @param {String} fontName */ setTitleFontName: function (fontName) { - this._createTitleRendererIfNeeded(fontName); + this._createTitleRendererIfNeeded(); - this._titleRenderer.setFontName && this._titleRenderer.setFontName(fontName); + this._titleRenderer.setFontName(fontName); this._fontName = fontName; },