Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui

# Conflicts:
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.min.js
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.js
#	dist/utils.min.js

dist/2.0/fineui.ie.js

@@ -49760,12 +49760,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/2.0/fineui.js

@@ -50164,12 +50164,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/base.js

@@ -11876,12 +11876,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/bundle.ie.js

@@ -49760,12 +49760,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/bundle.js

@@ -50164,12 +50164,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/fineui.ie.js

@@ -50005,12 +50005,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/fineui.js

@@ -50409,12 +50409,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

dist/fineui_without_jquery_polyfill.js

@@ -36910,12 +36910,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }

src/base/single/tip/tip.tooltip.js

@@ -57,12 +57,13 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             });
         } else {
             this.text = BI.createWidget({
-                type: "bi.text",
+                type: "bi.label",
                 element: this,
                 textAlign: "left",
                 whiteSpace: "normal",
                 text: o.text,
-                height: 16,
+                height: o.height,
+                textHeight: o.height - 2,
                 hgap: this._const.hgap
             });
         }