550 if ( result && !spacer.isEmpty() ) { |
552 if ( result && !spacer.isEmpty() ) { |
551 // intentionally overriding possible previously set value |
553 // intentionally overriding possible previously set value |
552 sizepolicyVal = QSizePolicy::Preferred; |
554 sizepolicyVal = QSizePolicy::Preferred; |
553 sizepolicyValP = &sizepolicyVal; |
555 sizepolicyValP = &sizepolicyVal; |
554 anchorId = spacer; |
556 anchorId = spacer; |
555 if (prefVal.mType != HbXmlLengthValue::None) { |
557 if (prefVal.mValues.count()) { |
556 // previously set by "spacing" |
558 // previously set by "spacing" |
557 minVal = prefVal; |
559 minVal = prefVal; |
558 } else { |
560 } else { |
559 prefVal.mType = HbXmlLengthValue::PlainNumber; |
561 prefVal.mValues.append(HbExpressionParser::LengthInPixels); |
560 prefVal.mValue = 0; |
562 prefVal.mValues.append(HbExpressionParser::toFixed(0.0)); |
561 } |
563 } |
562 if ( !directionValP ) { |
564 if ( !directionValP ) { |
563 // direction not yet set, use heuristics |
565 // direction not yet set, use heuristics |
564 bool srcIsLayout = src.isEmpty() && srcId.isEmpty(); |
566 bool srcIsLayout = src.isEmpty() && srcId.isEmpty(); |
565 bool negativeEdge = srcEdge == Hb::LeftEdge || srcEdge == Hb::TopEdge; |
567 bool negativeEdge = srcEdge == Hb::LeftEdge || srcEdge == Hb::TopEdge; |
772 ( stringName == lexemValue(TYPE_FONTSPEC) )|| |
774 ( stringName == lexemValue(TYPE_FONTSPEC) )|| |
773 ( stringName == lexemValue(LL_ORIENTATION) )|| |
775 ( stringName == lexemValue(LL_ORIENTATION) )|| |
774 ( stringName == lexemValue(TYPE_ALIGNMENT) )) { |
776 ( stringName == lexemValue(TYPE_ALIGNMENT) )) { |
775 return HbXml::PROPERTY; |
777 return HbXml::PROPERTY; |
776 } else if ( ( stringName == lexemValue(TYPE_CONTENTSMARGINS) ) || |
778 } else if ( ( stringName == lexemValue(TYPE_CONTENTSMARGINS) ) || |
777 ( stringName == lexemValue(TYPE_SIZEPOLICY) ) || |
779 ( stringName == lexemValue(TYPE_SIZEPOLICY) ) || |
778 ( stringName == lexemValue(TYPE_SIZEHINT) ) || |
780 ( stringName == lexemValue(TYPE_SIZEHINT) ) || |
779 ( stringName == lexemValue(TYPE_TOOLTIP) ) ) { |
781 ( stringName == lexemValue(TYPE_TOOLTIP) ) || |
|
782 ( stringName == lexemValue(TYPE_BACKGROUND ) ) ) { |
780 return HbXml::VARIABLE; |
783 return HbXml::VARIABLE; |
781 } else if ( stringName == lexemValue(TYPE_ZVALUE) ) { |
784 } else if ( stringName == lexemValue(TYPE_ZVALUE) ) { |
782 qWarning() << "zvalue variable in docml is deprecated. Use z property instead."; |
785 qWarning() << "zvalue variable in docml is deprecated. Use z property instead."; |
783 //return HbXml::DEPRECATED; |
786 //return HbXml::DEPRECATED; |
784 return HbXml::VARIABLE; |
787 return HbXml::VARIABLE; |