You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2021/11/07 09:03:38 UTC
[royale-asjs] branch develop updated: Let swf version use label
measurements to avoid having to implement an ITextFieldFactory for now.
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new b3e4ebe Let swf version use label measurements to avoid having to implement an ITextFieldFactory for now.
b3e4ebe is described below
commit b3e4ebe711a7c89b379debf22ded3cdc026cf37b
Author: Yishay Weiss <yi...@hotmail.com>
AuthorDate: Sun Nov 7 11:02:09 2021 +0200
Let swf version use label measurements to avoid having to implement an ITextFieldFactory for now.
Fixes current mustella issues with ListAndDataGridTest.
---
.../dataGridClasses/DataGridHeaderRenderer.as | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridHeaderRenderer.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridHeaderRenderer.as
index 8ce0622..628abeb 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridHeaderRenderer.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/dataGridClasses/DataGridHeaderRenderer.as
@@ -703,7 +703,16 @@ public class DataGridHeaderRenderer extends UIComponent implements IDataRenderer
horizontalGap = 0;
// Adjust to given width
- var lineMetrics:TextLineMetrics = measureText(usingHTML ? label.htmlText: label.text);
+ COMPILE::JS
+ {
+ var lineMetrics:TextLineMetrics = measureText(usingHTML ? label.htmlText: label.text);
+ }
+ COMPILE::SWF
+ {
+ var lineMetrics:TextLineMetrics = new TextLineMetrics();
+ lineMetrics.width = label.width;
+ lineMetrics.height = label.height;
+ }
var labelWidth:Number = lineMetrics.width + UITextField.TEXT_WIDTH_PADDING;
var maxLabelWidth:int = unscaledWidth - sortItemRendererWidth
- horizontalGap - paddingLeft - paddingRight;
@@ -719,7 +728,14 @@ public class DataGridHeaderRenderer extends UIComponent implements IDataRenderer
}
// Adjust to given height
- var labelHeight:Number = label.textHeight + UITextField.TEXT_HEIGHT_PADDING;
+ COMPILE::JS
+ {
+ var labelHeight:Number = label.textHeight + UITextField.TEXT_HEIGHT_PADDING;
+ }
+ COMPILE::SWF
+ {
+ var labelHeight:Number = label.height + UITextField.TEXT_HEIGHT_PADDING;
+ }
var maxLabelHeight:int = unscaledHeight - paddingTop - paddingBottom;
if (maxLabelHeight < labelHeight)