FCL/sf/mw/hgwidgets: comparison ganeswidgets/src/hgindexfeedback.cpp

equal deleted inserted replaced

-:8bf920201dea
+:0e550c9259fd
 #include "hgindexfeedback.h"
 #include "hgindexfeedback_p.h"
 #include <HbScrollbar>
-#include <HbStyleOptionIndexFeedback>
 #include <HbStyleParameters>
 #include <HbStyle>
 #include <HbDeviceProfile>
 #include <hgwidgets/hgwidgets.h>
 #include <HbStyleLoader>
 #include <QEvent>
 #include <QObject>
 #include <QGraphicsScene>
 /* rather than magic numbers, let's define some constants. */
 namespace {
 /*
 string name from the index feedback .css for the single character height parameter.
 */
 /*!
 Constructs a new HgIndexFeedback with a parent.
 */
 HgIndexFeedback::HgIndexFeedback(QGraphicsItem *parent)
-: HbWidget( *new HgIndexFeedbackPrivate, parent, 0)
+: HbWidget(parent), p_ptr(new HgIndexFeedbackPrivate)
 {
 Q_D( HgIndexFeedback );
 d->q_ptr = this;
 Destructs the index feedback.
 */
 HgIndexFeedback::~HgIndexFeedback()
 {
 HbStyleLoader::unregisterFilePath(":/hgindexfeedback.css");
+delete p_ptr;
 }
 /*!
 \brief sets the index feedback policy.
 return;
 }
 d->connectModelToIndexFeedback(d->mWidget->selectionModel());
-d->connectScrollBarToIndexFeedback(d->mWidget->scrollBar());
+d->connectWidgetToIndexFeedback();
 connect(d->mWidget, SIGNAL(destroyed(QObject*)),
 this, SLOT(_q_itemViewDestroyed()));
 if (d->mWidget->scene()) {
 Q_D( const HgIndexFeedback );
 return d->mWidget;
 }
-/*!
-Returns the primitives used in HgIndexFeedback.
-\param primitive The primitive type requested.
-\return A pointer for the primitive requested.
-*/
-QGraphicsItem* HgIndexFeedback::primitive(HbStyle::Primitive primitive) const
-{
-Q_D( const HgIndexFeedback );
-QGraphicsItem* retVal = HbWidget::primitive(primitive);
-switch (primitive) {
-case HbStyle::P_IndexFeedback_popup_text:
-retVal = d->mTextItem;
-break;
-case HbStyle::P_IndexFeedback_popup_background:
-retVal = d->mPopupItem;
-break;
-default:
-qt_noop();
-break;
-}
-return retVal;
-}
 /*
 A scene event filter.  It's purpose is to call calculatePopupRects on
 a resize event for the item view.
 */
 bool HgIndexFeedback::sceneEventFilter(QGraphicsItem *watched, QEvent *ev)
 {
 Q_D( HgIndexFeedback );
 if (ev->type() == QEvent::GraphicsSceneResize) {
 d->calculatePopupRects();
+d->updatePrimitives();
 }
 return QGraphicsItem::sceneEventFilter(watched, ev);
 }
 this function will call the appropriate function in HgIndexFeedbackPrivate.
 */
 bool HgIndexFeedback::eventFilter(QObject *obj, QEvent *ev)
 {
 Q_D( HgIndexFeedback );
-HbScrollBar* scrollBar = qobject_cast<HbScrollBar*>(obj);
+HbScrollBar *scrollBar = qobject_cast<HbScrollBar*>(obj);
+HgWidget *widget = qobject_cast<HgWidget*>(obj);
-if (d->mIndexFeedbackPolicy != HgWidget::IndexFeedbackNone
-&& scrollBar) {
+if (d->mIndexFeedbackPolicy != HgWidget::IndexFeedbackNone) {
-switch (ev->type()) {
+if (scrollBar) {
-case QEvent::GraphicsSceneMousePress:
+switch (ev->type()) {
-case QEvent::MouseButtonPress:
+case QEvent::GraphicsSceneMousePress:
-if (scrollBar->isInteractive()) {
+case QEvent::MouseButtonPress:
-d->scrollBarPressed();
+if (scrollBar->isInteractive()) {
-}
+d->scrollBarPressed();
-break;
+}
+break;
-case QEvent::GraphicsSceneMouseRelease:
-case QEvent::MouseButtonRelease:
+case QEvent::GraphicsSceneMouseRelease:
-if (scrollBar->isInteractive()) {
+case QEvent::MouseButtonRelease:
-d->scrollBarReleased();
+if (scrollBar->isInteractive()) {
-}
+d->scrollBarReleased();
-break;
+}
+break;
-case QEvent::GraphicsSceneResize:
+default:
-case QEvent::Resize:
+// do nothing, ignore other events.
-d->_q_hideIndexFeedbackNow();
+break;
-d->calculatePopupRects();
+}
-d->updatePrimitives();
-break;
-default:
-// do nothing, ignore other events.
-break;
 }
+if (widget && (ev->type() == QEvent::GraphicsSceneResize || ev->type() == QEvent::Resize)) {
+// widget size has changed and size of the popup letter box depends from it
+// so recalculate the popup rects
+d->_q_hideIndexFeedbackNow();
+d->calculatePopupRects();
+d->updatePrimitives();
+}
 }
 return QObject::eventFilter(obj, ev);
-}
-/*
-For use with HbStyle.
-Provide the correct data to use in the 'model.'
-*/
-void HgIndexFeedback::initStyleOption(HbStyleOptionIndexFeedback *option) const
-{
-Q_D( const HgIndexFeedback );
-HbWidget::initStyleOption(option);
-if (!d->mWidget) {
-return;
-}
-HbFontSpec fontSpec;
-qreal margin = 0;
-style()->parameter(QLatin1String("hb-param-margin-gene-popup"), margin);
-switch (d->mIndexFeedbackPolicy) {
-case HgWidget::IndexFeedbackSingleCharacter:
-{
-fontSpec = HbFontSpec(HbFontSpec::Primary);
-fontSpec.setTextHeight(d->textHeight());
-}
-break;
-case HgWidget::IndexFeedbackThreeCharacter:
-{
-fontSpec = HbFontSpec(HbFontSpec::Primary);
-fontSpec.setTextHeight(d->textHeight());
-}
-break;
-case HgWidget::IndexFeedbackString:
-{
-fontSpec = HbFontSpec(HbFontSpec::Primary);
-qreal textPaneHeight = 0;
-style()->parameter(QLatin1String("hb-param-text-height-primary"), textPaneHeight);
-fontSpec.setTextHeight( textPaneHeight );
-}
-break;
-case HgWidget::IndexFeedbackNone:
-// leave the HbStyleOption uninitialized
-return;
-}
-option->text = d->mPopupContent;
-option->fontSpec = fontSpec;
-option->textRect = d->mPopupTextRect;
-option->popupRect = d->mPopupBackgroundRect;
 }
 void HgIndexFeedback::polish(HbStyleParameters& params)
 {
 Q_D( HgIndexFeedback );
 d->mThreeCharHeight = params.value( THREE_CHAR_HEIGHT ).toDouble();
 d->mThreeCharWidth = params.value( THREE_CHAR_WIDTH ).toDouble();
 d->mStringOffset = params.value( STRING_OFFSET ).toDouble();
 d->calculatePopupRects();
+d->updatePrimitives();
 }
 #include "moc_hgindexfeedback.cpp"

changeset 16	0e550c9259fd
parent 8	15f034b8a3b5