equal
deleted
inserted
replaced
26 #include "hbxmlloaderbaseactions_p.h" |
26 #include "hbxmlloaderbaseactions_p.h" |
27 #include "hbxmlloaderabstractsyntax_p.h" |
27 #include "hbxmlloaderabstractsyntax_p.h" |
28 #include <hbinstance.h> |
28 #include <hbinstance.h> |
29 #include <hbdeviceprofile.h> |
29 #include <hbdeviceprofile.h> |
30 #include <hbstyle.h> |
30 #include <hbstyle.h> |
|
31 #include "hbstyle_p.h" |
31 |
32 |
32 #include <QCoreApplication> |
33 #include <QCoreApplication> |
33 |
34 |
34 const char *GRAPHICSWIDGETCLASSNAME = "QGraphicsWidget"; |
35 const char *GRAPHICSWIDGETCLASSNAME = "QGraphicsWidget"; |
35 |
36 |
350 break; |
351 break; |
351 case HbXmlLengthValue::Millimeter: |
352 case HbXmlLengthValue::Millimeter: |
352 result = mCurrentProfile.ppmValue() * lengthVal.mValue; |
353 result = mCurrentProfile.ppmValue() * lengthVal.mValue; |
353 break; |
354 break; |
354 case HbXmlLengthValue::Variable: |
355 case HbXmlLengthValue::Variable: |
|
356 case HbXmlLengthValue::VariableNegative: |
|
357 retVal = hbInstance->style()->d_func()->parameterFromHashValue(lengthVal.mHashValue, result, mCurrentProfile); |
|
358 if ( lengthVal.mType == HbXmlLengthValue::VariableNegative ) { |
|
359 result *= -1.0; |
|
360 } |
|
361 break; |
355 case HbXmlLengthValue::Expression: |
362 case HbXmlLengthValue::Expression: |
|
363 case HbXmlLengthValue::ExpressionNegative: |
|
364 // HbStyle::parameter handles the negative case as the minus sign is part of mString. |
356 retVal = hbInstance->style()->parameter( lengthVal.mString, result, mCurrentProfile ); |
365 retVal = hbInstance->style()->parameter( lengthVal.mString, result, mCurrentProfile ); |
357 break; |
366 break; |
358 } |
367 } |
359 return retVal; |
368 return retVal; |
360 } |
369 } |