FCL/sf/mw/hb: comparison src/hbcore/style/hbstyle.cpp

equal deleted inserted replaced

-:e6ad4ef83b23
+:b7da29130b0e
 textItem->setTextVisible(td->isTextVisible);
 if (td->isTextClip.isSet())
 textItem->setTextClip(td->isTextClip);
 if (td->geometry.isSet())
 textItem->setGeometry(td->geometry);
-if (td->fadeLength.isSet())
-textItem->setFadeLength(td->fadeLength);
 if (td->fadeLengths.isSet())
 textItem->setFadeLengths(td->fadeLengths);
+if (td->minimumLines.isSet())
+textItem->setMinimumLines(td->minimumLines);
+if (td->maximumLines.isSet())
+textItem->setMaximumLines(td->maximumLines);
 return true;
 } else if (HbIconItem *iconItem = qgraphicsitem_cast<HbIconItem*>(primitive)) {
 const HbStyleIconPrimitiveData *id = hbstyleprimitivedata_cast<const HbStyleIconPrimitiveData*>(data);
 if (id->icon.isSet())
 case P_StatusBar_background: {
 const HbStyleOptionStatusBar *opt = qstyleoption_cast<const HbStyleOptionStatusBar *>(option);
 if (opt) {
 HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
+frameItem->frameDrawer().setFillWholeRect(true);
 if (opt->transparent) {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_statusbar_trans"));
 } else {
 frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_statusbar"));
 }
 case P_PushButton_focus: {
 if (const HbStyleOptionPushButton *opt =
 qstyleoption_cast<const HbStyleOptionPushButton *>(option)) {
 HbFrameItem *iconItem  = static_cast<HbFrameItem*>(item);
 iconItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_btn_highlight"));
-int margin = 4;
+//int margin = 4;
-QRectF focusRect  = opt->rect.adjusted(-margin , -margin , margin , margin);
+//QRectF focusRect  = opt->rect.adjusted(-margin , -margin , margin , margin);
-iconItem->setGeometry(focusRect);
+iconItem->setGeometry(opt->boundingRect);
 iconItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 }
 break;
 }
 case P_ToolButton_frame:{
 frameItem->setMaximum(opt->maximum);
 frameItem->setMinimum(opt->minimum);
 frameItem->setValue(opt->sliderValue);
 frameItem->setOrientation(opt->orientation);
 frameItem->setSpan( opt->span );
+frameItem->setHandleRect(opt->handleRect);
 frameItem->update();
 }
 break;
 }
 case P_Slider_groove:{
 thumbPath=logicalName(HbStylePrivate::P_Slider_thumb, option);
 }
 else
 {
 thumbPath=opt->thumbPath;
-iconItem->setAlignment(Qt::AlignCenter);
+}
-}
+iconItem->setAlignment(Qt::AlignCenter);
 iconItem->setIconName(thumbPath);
 iconItem->setAspectRatioMode(Qt::KeepAspectRatio);
 }
 break;
 }
 case P_MenuItem_submenuindicator:
 if (const HbStyleOptionMenuItem *opt = qstyleoption_cast<const HbStyleOptionMenuItem *>(option)) {
 HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 Q_UNUSED(opt)
-iconItem->setIconName(QLatin1String("qtg_mono_options_menu"));
+iconItem->setIconName(QLatin1String("qtg_mono_arrow_right"));
 }
 break;
 case P_MenuItem_checkindicator:
 if (const HbStyleOptionMenuItem *opt = qstyleoption_cast<const HbStyleOptionMenuItem *>(option)) {
 }
 }
 break;
 case P_TumbleView_highlight:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_highlight_pri");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
 frameItem->setZValue(-1);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(0,(opt->boundingRect.height()-frameItem->boundingRect().height())/2,opt->boundingRect.width(),opt->boundingRect.height());
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_IndexFeedback_popup_text:
 if (const HbStyleOptionIndexFeedback *opt = qstyleoption_cast<const HbStyleOptionIndexFeedback *>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
 frameItem->setGeometry(opt->popupRect);
 }
 }
 break;
 case P_DateTimePicker_background:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_bg");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->setZValue(-5);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(opt->boundingRect);
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_DateTimePicker_frame:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_overlay");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
 frameItem->setZValue(1);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(opt->boundingRect);
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_DateTimePicker_separator:
-if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
+/* if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
 if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
 frameItem->frameDrawer().setFrameGraphicsName("qtg_graf_tumbler_divider");
 frameItem->frameDrawer().setFrameType(HbFrameDrawer::OnePiece);
 frameItem->setZValue(2);
 //TODO:temp fix, issue with css rule picking in derived class
 //frameItem->setGeometry(0,(opt->boundingRect.height()-frameItem->boundingRect().height())/2,opt->boundingRect.width(),opt->boundingRect.height());
 Q_UNUSED(opt);
 }
-}
+}*/
 break;
 case P_InputDialog_text:
 if (const HbStyleOptionInputDialog *opt =
 qstyleoption_cast<const HbStyleOptionInputDialog*>(option)) {
 HbTextItem *textItem = static_cast<HbTextItem*>(item);
 const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, widget, profile);
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishItem : -- Number of matching CSS declarations: " << decl.count();
 #endif
-HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(layoutParameters);
 HbCss::KnownProperties prop;
 if ( !extractor.extractKnownProperties(prop) ) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishItem : -- No polish overrides found";
 const HbVector<HbCss::Declaration> decl = declarations(styleRules, anchor->anchorId(), widget, profile);
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishAnchor : -- Number of matching CSS declarations: " << decl.count();
 #endif
-HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(layoutParameters);
 HbCss::KnownProperties prop;
 if ( !extractor.extractKnownProperties(prop) ) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polishAnchor : -- No polish overrides found";
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::polish : Number of matching CSS declarations: " << decl.count();
 #endif
 d->layoutParameters.init(profile);
-HbCss::ValueExtractor extractor(decl, d->layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(d->layoutParameters);
 QString layoutName;
 QString sectionName;
 if ( params.count() ) {
 #ifdef HBSTYLE_DEBUG
 if ( effectiveProfile.isNull() ) {
 effectiveProfile = HbDeviceProfile::current();
 }
 Q_D( const HbStyle );
 d->layoutParameters.init(effectiveProfile);
-HbCss::ValueExtractor valueExtractor(d->layoutParameters, true, effectiveProfile);
+HbCss::ValueExtractor valueExtractor(effectiveProfile);
+valueExtractor.setLayoutParameters(d->layoutParameters);
 // todo: parsing variable/expression is done here so that there is no need to change API
 // also parameters method not changed (this change is done for docml/widgetml parsing)
 if (param.startsWith(QLatin1String("var(")) && param.endsWith(QLatin1String(")"))) {
 return valueExtractor.extractVariableValue(param.mid(4,param.length()-5), value);
 } else if (param.startsWith(QLatin1String("-var(")) && param.endsWith(QLatin1String(")"))) {
 }
 return valueExtractor.extractVariableValue(param, value);
 }
+bool HbStylePrivate::parameterFromHashValue(quint32 hashValue, qreal &value, const HbDeviceProfile &profile) const
+{
+HbDeviceProfile effectiveProfile = profile;
+if ( effectiveProfile.isNull() ) {
+effectiveProfile = HbDeviceProfile::current();
+}
+layoutParameters.init(effectiveProfile);
+HbCss::ValueExtractor valueExtractor(effectiveProfile);
+valueExtractor.setLayoutParameters(layoutParameters);
+return valueExtractor.extractVariableValue(hashValue, value);
+}
 /*!
 Returns copy of all global style parameters. Both names and values
 of the parameters are returned. The values are returned in pixels.
 Available parameters can be found from hbglobalparameters.css. By using these
 effectiveProfile = HbDeviceProfile::current();
 }
 Q_D( const HbStyle );
 d->layoutParameters.init(effectiveProfile);
-HbCss::ValueExtractor valueExtractor(d->layoutParameters, true, effectiveProfile);
+HbCss::ValueExtractor valueExtractor(effectiveProfile);
+valueExtractor.setLayoutParameters(d->layoutParameters);
 qreal value = 0;
 HbLayoutParameters::const_iterator i = d->layoutParameters.constBegin();
 while (i != d->layoutParameters.constEnd()) {
 QString name(d->layoutParameters.name(i));
 if (valueExtractor.extractVariableValue(name, value)) {
 #ifdef HBSTYLE_DEBUG
 qDebug() << "HbStyle::widgetParameters : Number of matching CSS declarations: " << decl.count();
 #endif
 d->layoutParameters.init(profile);
-HbCss::ValueExtractor extractor(decl, d->layoutParameters, profile);
+HbCss::ValueExtractor extractor(decl, profile);
+extractor.setLayoutParameters(d->layoutParameters);
 extractor.extractCustomProperties( params.keys(), params.values() );
 }
 /*!

changeset 28	b7da29130b0e
parent 23	e6ad4ef83b23
child 30	80e4d18b72f5