diff -r 2f8f8080a020 -r ebdbd102c78a phoneuis/bubblemanager2/bubblecore/src/bubblecontainerwidget.cpp --- a/phoneuis/bubblemanager2/bubblecore/src/bubblecontainerwidget.cpp Mon May 03 12:31:11 2010 +0300 +++ b/phoneuis/bubblemanager2/bubblecore/src/bubblecontainerwidget.cpp Fri May 14 15:51:57 2010 +0300 @@ -20,46 +20,32 @@ #include #include #include "bubblecontainerwidget.h" -#include "bubbleprimitives.h" -#include "bubblestyleoption.h" -BubbleContainerWidget::BubbleContainerWidget( - const QString& stylePluginName, QGraphicsItem* item) - : HbWidget(item), mStylePluginName(stylePluginName), - mBackground(0) +BubbleContainerWidget::BubbleContainerWidget(QGraphicsItem* item) + : HbWidget(item), mBackground(0) { - setPluginBaseId(style()->registerPlugin(mStylePluginName)); - Q_ASSERT(pluginBaseId()!=-1); - createPrimitives(); updatePrimitives(); + Q_ASSERT(mBackground); } BubbleContainerWidget::~BubbleContainerWidget() { - style()->unregisterPlugin(mStylePluginName); } void BubbleContainerWidget::createPrimitives() { - QGraphicsItem *background = style()->createPrimitive( - (HbStyle::Primitive)(pluginBaseId()+BP_Bubble_frame), this); + delete mBackground; + mBackground = new HbFrameItem(this); style()->setItemName(mBackground, "background"); - - delete mBackground; - mBackground = - qgraphicsitem_cast(background); + mBackground->setZValue(-1.0); + mBackground->setVisible(false); // background in drawn in paint() } void BubbleContainerWidget::updatePrimitives() { - if (mBackground) { - BubbleStyleOption option; - style()->updatePrimitive( - mBackground, (HbStyle::Primitive)(pluginBaseId()+BP_Bubble_frame), - &option); - mBackground->setVisible(false); // background in drawn in paint() - } + mBackground->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); + mBackground->frameDrawer().setFrameGraphicsName("qtg_fr_list_normal"); } void BubbleContainerWidget::mousePressEvent( @@ -89,7 +75,7 @@ } void BubbleContainerWidget::mouseReleaseEvent( - QGraphicsSceneMouseEvent * event) + QGraphicsSceneMouseEvent *event) { if (event->button() != Qt::LeftButton) { event->ignore(); @@ -111,8 +97,12 @@ Q_UNUSED(widget) Q_UNUSED(option) - if (mBackground) { - mBackground->frameDrawer().paint(painter,boundingRect()); - } + mBackground->frameDrawer().paint(painter,boundingRect()); } +void BubbleContainerWidget::showEvent(QShowEvent *event) +{ + Q_UNUSED(event) + mPressed = false; +} +