FCL/sf/mw/hb: comparison src/hbinput/inputwidgets/hbinputbuttongroup.cpp

equal deleted inserted replaced

-:c3690ec91ef8
+:923ff622b8b9
 if (i < mButtonDrawers.count()) {
 if (drawer != mButtonDrawers.at(i)) {
 HbFrameDrawerPool::release(mButtonDrawers.at(i));
 mButtonDrawers.replace(i, drawer);
+} else {
+HbFrameDrawerPool::release(drawer);
 }
 } else {
 mButtonDrawers.append(drawer);
 }
 void HbInputButtonGroupPrivate::showButtonPreview(HbInputButton *const item)
 {
 Q_Q(HbInputButtonGroup);
+// Button preview should be shown only for non-function buttons if preview
+// is enabled for this button group. Space key is handled as a special case
+// and no preview will be shown for that although it is not function button.
 int index = mButtonData.indexOf(item);
-if (mButtonPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
+if (mButtonPreviewEnabled && !mButtonPreview.contains(index) &&
-!mButtonPreview.contains(index)) {
+item->type() != HbInputButton::ButtonTypeFunction &&
+item->keyCode() != HbInputButton::ButtonKeyCodeSpace) {
 HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1));
 mButtonPreview.insert(index, group);
+// Create preview button and add it to the new button group
 QList<HbInputButton *> buttons;
 HbInputButton *previewItem = 0;
 if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
 int keyCode = -1;
 if (!item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty()) {
 group->setButtons(buttons);
 qreal cellWidth = q->boundingRect().width() / mGridSize.width();
 qreal cellHeight = q->boundingRect().height() / mGridSize.height();
+// Calculate text size
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
 font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeLabel)));
 QFontMetricsF fontMetrics(font);
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
+// Calculate preview size
 qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue;
 if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
 width = item->boundingRect().width();
 } else if (width < HbPreviewWidthInUnits * mUnitValue) {
 width = HbPreviewWidthInUnits * mUnitValue;
 void HbInputButtonGroupPrivate::showCharacterSelectionPreview(HbInputButton *const item)
 {
 Q_Q(HbInputButtonGroup);
+// Character preview should be shown only for non-function buttons which contains more
+// than one character if preview is enabled for this button group
 if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
 item->mappedCharacters().count() > 1) {
-HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantLongPressed, Hb::ModifierInputFunctionButton);
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+}
 mProbabilities.clear();
 q->cancelButtonPress();
+// Create and initialize character preview
 if (!mCharacterSelectionPreview) {
 mCharacterSelectionPreview = new HbDialog();
 HbInputRegionCollector::instance()->attach(mCharacterSelectionPreview);
 mCharacterSelectionPreview->setModal(true);
 mCharacterSelectionPreview->setBackgroundFaded(false);
 QObject::connect(group, SIGNAL(pressedButtonChanged(const QKeyEvent &, const QKeyEvent &)), q, SLOT(emitPressedButtonChanged(const QKeyEvent &, const QKeyEvent &)));
 qreal cellWidth = q->boundingRect().width() / mGridSize.width();
 qreal cellHeight = q->boundingRect().height() / mGridSize.height();
+// Calculate text size
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
 font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeLabel)));
 QFontMetricsF fontMetrics(font);
 qreal textWidth = fontMetrics.width(item->mappedCharacters());
-qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * item->mappedCharacters().count();
+// Calculate preview size
+qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * (item->mappedCharacters().count() - 1);
 qreal height = HbPreviewHeightInUnits * mUnitValue;
 qreal x = q->scenePos().x() + (item->position().x() + 0.5 * item->size().width()) * cellWidth;
 qreal y = q->scenePos().y() + item->position().y() * cellHeight;
+// Create character preview button and add it to the created button group
 QList<HbInputButton *> buttons;
 for (int i = 0; i < item->mappedCharacters().count(); ++i) {
 HbInputButton *previewItem = new HbInputButton(item->keyCode(), QPoint(i, 0));
 previewItem->setType(HbInputButton::ButtonTypeLabel);
 previewItem->setText(item->mappedCharacters().at(i), HbInputButton::ButtonTextIndexPrimary);
 buttons.append(previewItem);
 }
 group->setButtons(buttons);
 group->setButtonBorderSize(0);
-mCharacterSelectionPreview->setPreferredSize(QSizeF(width, height));
+group->setPreferredSize(QSizeF(width, height));
 mCharacterSelectionPreview->setPreferredPos(QPointF(x, y), HbPopup::BottomEdgeCenter);
 mCharacterSelectionPreview->setContentWidget(group);
 HbFrameDrawer *drawer = HbFrameDrawerPool::get(HbPreviewBackground, HbFrameDrawer::ThreePiecesHorizontal, QSizeF(width, height));
 drawer->setFillWholeRect(true);
 void HbInputButtonGroupPrivate::pressEvent(const QPointF &position, bool emitSignal)
 {
 Q_Q(HbInputButtonGroup);
+// Ignore press events outside button group
 if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
 position.y() >= 0 && position.y() < q->boundingRect().height())) {
 return;
 }
 if (item->state() == HbInputButton::ButtonStateDisabled) {
 startLongPress(index);
 }
 return;
 }
-HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantPressed, Hb::ModifierInputFunctionButton);
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+}
 item->setState(HbInputButton::ButtonStatePressed);
 updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
 updateTextLayouts(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
 q->update();
 void HbInputButtonGroupPrivate::doublePressEvent(const QPointF &position, bool emitSignal)
 {
 Q_Q(HbInputButtonGroup);
+// Ignore double press events outside button group
 if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
 position.y() >= 0 && position.y() < q->boundingRect().height())) {
 return;
 }
 startLongPress(index);
 }
 return;
 }
-HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantPressed, Hb::ModifierInputFunctionButton);
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+}
 item->setState(HbInputButton::ButtonStatePressed);
 updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
 updateTextLayouts(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
 q->update();
 int newRow = static_cast<int>(newPosition.y() / (q->boundingRect().height() / mGridSize.height()));
 int oldIndex = mButtonGridPositions.value(QPair<int, int>(oldColumn, oldRow), -1);
 int newIndex = mButtonGridPositions.value(QPair<int, int>(newColumn, newRow), -1);
+// Check if movement happens inside button group
 if (newPosition.x() >= 0 && newPosition.x() < q->boundingRect().width() &&
 newPosition.y() >= 0 && newPosition.y() < q->boundingRect().height() &&
 oldPosition.x() >= 0 && oldPosition.x() < q->boundingRect().width() &&
 oldPosition.y() >= 0 && oldPosition.y() < q->boundingRect().height()) {
 QKeyEvent pressEvent(QEvent::KeyPress, newItem->keyCode(), Qt::NoModifier, text);
 q->emitPressedButtonChanged(releaseEvent, pressEvent);
 }
 } else {
+// Move event came from outside button group so create new release and press events
+// for old and new position. If one of the positions is inside button group
+// a new event will get generated.
 releaseEvent(oldPosition, false);
 pressEvent(newPosition);
 }
 }
 void HbInputButtonGroupPrivate::releaseEvent(const QPointF &position, bool emitSignal)
 {
 Q_Q(HbInputButtonGroup);
+// Ignore release events outside button group
 if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
 position.y() >= 0 && position.y() < q->boundingRect().height())) {
 return;
 }
 if (item->state() != HbInputButton::ButtonStatePressed) {
 return;
 }
-HbWidgetFeedback::triggered(q, Hb::InstantReleased);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantReleased, Hb::ModifierInputFunctionButton);
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantReleased);
+}
 item->setState(HbInputButton::ButtonStateReleased);
 updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
 updateTextLayouts(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
 q->update();
 }
 hideButtonPreview(item);
 if (emitSignal) {
-HbWidgetFeedback::triggered(q, Hb::InstantClicked);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantClicked, Hb::ModifierInputFunctionButton);
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantClicked);
+}
 int actionIndex = item->keyCode() - HbInputButton::ButtonKeyCodeCustom;
 if (actionIndex >= 0 && actionIndex < mCustomActions.count()) {
 emit q->aboutToActivateCustomAction(mCustomActions.at(actionIndex));
 mCustomActions.at(actionIndex)->activate(QAction::Trigger);
 } else {
 mLongPressTimers.removeAt(0);
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
+// Handle autorepeating buttons
 if (item->autoRepeat() &&
 (item->state() == HbInputButton::ButtonStatePressed ||
 item->state() == HbInputButton::ButtonStateLatched)) {
 mLongPressButtons.append(index);
 mLongPressTimers.append(timer);
 timer->start(HbAutoRepeatTimeout);
-HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated, Hb::ModifierInputFunctionButton);
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated);
+}
 QString text;
 if (item->type() == HbInputButton::ButtonTypeLabel) {
 text = item->text(HbInputButton::ButtonTextIndexPrimary);
 }
-QKeyEvent releaeEvent(QEvent::KeyRelease, item->keyCode(), Qt::NoModifier, text, true);
+int keycode = item->keyCode();
+QKeyEvent releaeEvent(QEvent::KeyRelease, keycode, Qt::NoModifier, text, true);
 q->emitButtonReleased(releaeEvent);
-QKeyEvent pressEvent(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
+QKeyEvent pressEvent(QEvent::KeyPress, keycode, Qt::NoModifier, text, true);
 q->emitButtonPressed(pressEvent);
 } else {
-if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction && item->mappedCharacters().count() > 1) {
+// Buttons that doesn't support autorepeat can either show character preview
+// or generate a long press
+if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction
+&& item->mappedCharacters().count() > 1) {
 showCharacterSelectionPreview(item);
 } else {
-HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+if (item->type() == HbInputButton::ButtonTypeFunction) {
+HbWidgetFeedback::triggered(q, Hb::InstantLongPressed, Hb::ModifierInputFunctionButton);
-delete timer;
+}
+else {
+HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+}
 QString text;
 if (item->type() == HbInputButton::ButtonTypeLabel) {
 text = item->text(HbInputButton::ButtonTextIndexPrimary);
 }
 QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
 q->emitButtonLongPressed(event);
 }
+delete timer;
 }
 }
 }
 void HbInputButtonGroupPrivate::calculateButtonProbabilities(const QPointF &position)
 qreal cellHeight = q->boundingRect().height() / mGridSize.height();
 QRectF touchArea = QRectF(position.x() - 0.5 * cellWidth, position.y() - 0.5 * cellHeight,
 HbTouchAreaSizeInUnits * mUnitValue, HbTouchAreaSizeInUnits * mUnitValue);
+// Calculate probabilities based on the intersection area of "touch area" and button area
 qreal probabilities = 0;
 foreach(HbInputButton *button, mButtonData) {
 QRectF intersection = button->boundingRect().intersected(touchArea);
 if (intersection.isValid()) {
 mTextLayouts.at(index)->setCacheEnabled(true);
 }
 void HbInputButtonGroupPrivate::createSecondaryTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size)
 {
-qreal cellWidth = size.width() / mGridSize.width();
-qreal cellHeight = size.height() / mGridSize.height();
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
 font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow)));
 mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
 QFontMetricsF fontMetrics(font);
 int layoutIndex = item->type() * HbInputButton::ButtonStateCount + item->state() + HbTextTypeCount * 2;
 if (!mEnabled) {
 layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled + HbTextTypeCount * 2;
 }
 if (index == layoutIndex) {
-if (!item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+// Layout secondary text for first row
-item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
+layoutSecondaryText(index, item, fontMetrics, size,
-qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow));
+HbInputButton::ButtonTextIndexSecondaryFirstRow,
-qreal textHeight = fontMetrics.height();
+HbInputButton::ButtonIconIndexSecondaryFirstRow,
+HbInputButton::ButtonTextIndexSecondarySecondRow,
-QTextLine line = mTextLayouts.at(index)->createLine();
+HbInputButton::ButtonIconIndexSecondarySecondRow,
-line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).length());
+HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow);
-layoutTextLine(HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
-}
+// Layout secondary text for second row
+layoutSecondaryText(index, item, fontMetrics, size,
-if (!item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
+HbInputButton::ButtonTextIndexSecondarySecondRow,
-item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+HbInputButton::ButtonIconIndexSecondarySecondRow,
-qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow));
+HbInputButton::ButtonTextIndexSecondaryFirstRow,
-qreal textHeight = fontMetrics.height();
+HbInputButton::ButtonIconIndexSecondaryFirstRow,
+HbInputButtonGroup::ButtonTextTypeSecondarySecondRow);
-QTextLine line = mTextLayouts.at(index)->createLine();
-line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).length());
-layoutTextLine(HbInputButtonGroup::ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
-}
 }
 }
 mTextLayouts.at(index)->endLayout();
 mTextLayouts.at(index)->setCacheEnabled(true);
 }
+void HbInputButtonGroupPrivate::layoutSecondaryText(int index, HbInputButton *item, QFontMetricsF &fontMetrics, const QSizeF &size,
+HbInputButton::HbInputButtonTextIndex firstTextIndex,
+HbInputButton::HbInputButtonIconIndex firstIconIndex,
+HbInputButton::HbInputButtonTextIndex secondTextIndex,
+HbInputButton::HbInputButtonIconIndex secondIconIndex,
+HbInputButtonGroup::HbInputButtonTextType textType)
+{
+qreal cellWidth = size.width() / mGridSize.width();
+qreal cellHeight = size.height() / mGridSize.height();
+if (!item->text(firstTextIndex).isEmpty() &&
+item->icon(firstIconIndex).isNull()) {
+qreal textWidth = fontMetrics.width(item->text(firstTextIndex));
+qreal textHeight = fontMetrics.height();
+QTextLine line = mTextLayouts.at(index)->createLine();
+line.setNumColumns(item->text(firstTextIndex).length());
+if (item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() &&
+item->icon(HbInputButton::ButtonIconIndexPrimary).isNull() &&
+item->text(secondTextIndex).isEmpty() &&
+item->icon(secondIconIndex).isNull()) {
+layoutTextLine(HbInputButtonGroup::ButtonTextTypeSingle, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+} else {
+layoutTextLine(textType, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+}
+}
+}
 void HbInputButtonGroupPrivate::layoutTextLine(HbInputButtonGroup::HbInputButtonTextType textType, const HbInputButton *button, const QSizeF &cellSize,
 QTextLine &textLine, const QSizeF &textSize)
 {
 qreal textPositionX = 0.0;
 qreal textPositionY = 0.0;
-if (textType == HbInputButtonGroup::ButtonTextTypeSingle ||
-textType == HbInputButtonGroup::ButtonTextTypeLabel) {
+switch(textType) {
-textPositionX = (button->position().x() + 0.5 * button->size().width()) * cellSize.width() - 0.5 * textSize.width();
+case HbInputButtonGroup::ButtonTextTypeSingle:
-textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
+case HbInputButtonGroup::ButtonTextTypeLabel:
-} else if (textType == HbInputButtonGroup::ButtonTextTypePrimary) {
+textPositionX = (button->position().x() + 0.5 * button->size().width()) * cellSize.width() - 0.5 * textSize.width();
-textPositionX = button->position().x() * cellSize.width() + HbHorizontalMarginInUnits * mUnitValue + mButtonBorderSize;
+textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
-textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
+break;
-} else if (textType == HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow) {
-textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+case HbInputButtonGroup::ButtonTextTypePrimary:
-textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+textPositionX = button->position().x() * cellSize.width() + HbHorizontalMarginInUnits * mUnitValue + mButtonBorderSize;
-textPositionY = (button->position().y() + button->size().height()) * cellSize.height() -
+textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
-textSize.height() - HbVerticalMarginInUnits * mUnitValue - mButtonBorderSize;
+break;
-} else if (textType == HbInputButtonGroup::ButtonTextTypeSecondarySecondRow) {
-textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+case HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow:
-textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
-textPositionY = button->position().y() * cellSize.height() + HbVerticalMarginInUnits * mUnitValue + mButtonBorderSize;
+textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+textPositionY = (button->position().y() + button->size().height()) * cellSize.height() -
+textSize.height() - HbVerticalMarginInUnits * mUnitValue - mButtonBorderSize;
+break;
+case HbInputButtonGroup::ButtonTextTypeSecondarySecondRow:
+textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+textPositionY = button->position().y() * cellSize.height() + HbVerticalMarginInUnits * mUnitValue + mButtonBorderSize;
+break;
+default:
+break;
 }
 textLine.setPosition(QPointF(textPositionX, textPositionY));
 }
 QString HbInputButtonGroupPrivate::buttonGraphics(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state)
 return QString("");
 }
 qreal HbInputButtonGroupPrivate::fontSize(HbInputButtonGroup::HbInputButtonTextType textType)
 {
-if (textType == HbInputButtonGroup::ButtonTextTypeSingle) {
+switch(textType) {
-return HbTextSizeInUnits * mUnitValue;
+case HbInputButtonGroup::ButtonTextTypeSingle:
-} else if (textType == HbInputButtonGroup::ButtonTextTypePrimary) {
+return HbTextSizeInUnits * mUnitValue;
-return HbPrimaryTextSizeInUnits * mUnitValue;
-} else if (textType == HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow ||
+case HbInputButtonGroup::ButtonTextTypePrimary:
-textType == HbInputButtonGroup::ButtonTextTypeSecondarySecondRow) {
+return HbPrimaryTextSizeInUnits * mUnitValue;
-return HbSecondaryTextSizeInUnits * mUnitValue;
-} else if (textType == HbInputButtonGroup::ButtonTextTypeLabel) {
+case HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow:
-return HbLabelTextSizeInUnits * mUnitValue;
+case HbInputButtonGroup::ButtonTextTypeSecondarySecondRow:
-}
+return HbSecondaryTextSizeInUnits * mUnitValue;
-return 0;
+case HbInputButtonGroup::ButtonTextTypeLabel:
+return HbLabelTextSizeInUnits * mUnitValue;
+default:
+return 0;
+}
 }
 void HbInputButtonGroupPrivate::startLongPress(int index)
 {
 Q_Q(HbInputButtonGroup);
 Q_D(HbInputButtonGroup);
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
-setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Constructor
 */
 Q_D(HbInputButtonGroup);
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
-setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Constructor
 */
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
 setGridSize(size);
-setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Constructor
 */
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
 setGridSize(size);
-setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Destructor
 */
 Q_UNUSED(option);
 Q_UNUSED(widget);
 Q_D(HbInputButtonGroup);
+// Draw button group background
 if (d->mBackground) {
 d->mBackground->paint(painter, QRectF(0, 0, boundingRect().width(), boundingRect().height()));
 }
 qreal cellWidth = boundingRect().width() / d->mGridSize.width();
 qreal cellHeight = boundingRect().height() / d->mGridSize.height();
 for (int i = 0; i < d->mButtonData.count(); ++i) {
 HbInputButton *item = d->mButtonData.at(i);
+// Draw button backgrounds
 if (d->mButtonDrawers.at(i)) {
 qreal x = item->position().x() * cellWidth + d->mButtonBorderSize;
 qreal y = item->position().y() * cellHeight + d->mButtonBorderSize;
 qreal width = item->size().width() * cellWidth - 2 * d->mButtonBorderSize;
 qreal height = item->size().height() * cellHeight - 2 * d->mButtonBorderSize;
 painter->translate(x, y);
 d->mButtonDrawers.at(i)->paint(painter, QRectF(0, 0, width, height));
 painter->restore();
 }
+// Draw primary icons
 if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
 qreal x = item->position().x() * cellWidth;
 qreal y = item->position().y() * cellHeight;
 qreal width = item->size().width() * cellWidth;
 qreal height = item->size().height() * cellHeight;
 height = HbPrimaryIconSizeInUnits * d->mUnitValue;
 }
 item->icon(HbInputButton::ButtonIconIndexPrimary).paint(painter, QRectF(x, y, width, height));
 }
+// Draw secondary icons on first row
 if (!item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
 qreal x = (item->position().x() + item->size().width()) * cellWidth -
 HbSecondaryIconSizeInUnits * d->mUnitValue - HbHorizontalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
 qreal y = (item->position().y() + item->size().height()) * cellHeight -
 HbSecondaryIconSizeInUnits * d->mUnitValue - HbVerticalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
 Qt::Alignment alignment = static_cast<Qt::Alignment>(Qt::AlignVCenter | Qt::AlignRight);
 item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).paint(painter, QRectF(x, y, width, height), Qt::KeepAspectRatio, alignment);
 }
+// Draw secondary icons on second row
 if (!item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
 qreal x = (item->position().x() + item->size().width()) * cellWidth -
 HbSecondaryIconSizeInUnits * d->mUnitValue - HbHorizontalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
 qreal y = item->position().y() * cellHeight + HbVerticalMarginInUnits * d->mUnitValue + d->mButtonBorderSize;
 qreal width = HbSecondaryIconSizeInUnits * d->mUnitValue;
 item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).paint(painter, QRectF(x, y, width, height), Qt::KeepAspectRatio, alignment);
 }
 }
+// Draw button texts
 for (int i = 0; i < HbTextLayoutCount; ++i) {
 painter->save();
 painter->setPen(d->mColors.at(i % HbTextTypeCount));
 if (d->mTextLayouts.at(i)) {
 if (!d->mEnabled) {
 event->ignore();
 return false;
 }
-if (event->type() == QEvent::TouchBegin) {
+switch(event->type()) {
-QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+case QEvent::TouchBegin: {
-foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-if (!point.isPrimary() && d->mMultiTouchEnabled) {
+foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
-d->pressEvent(point.pos());
+if (!point.isPrimary() && d->mMultiTouchEnabled) {
-}
-}
-} else if (event->type() == QEvent::TouchUpdate) {
-QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
-if (!point.isPrimary() && d->mMultiTouchEnabled) {
-if (point.state() & Qt::TouchPointPressed) {
 d->pressEvent(point.pos());
-} else if (point.state() & Qt::TouchPointMoved) {
+}
-d->moveEvent(point.lastPos(), point.pos());
+}
-} else if (point.state() & Qt::TouchPointReleased) {
+break;
+}
+case QEvent::TouchUpdate: {
+QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+if (!point.isPrimary() && d->mMultiTouchEnabled) {
+if (point.state() & Qt::TouchPointPressed) {
+d->pressEvent(point.pos());
+} else if (point.state() & Qt::TouchPointMoved) {
+d->moveEvent(point.lastPos(), point.pos());
+} else if (point.state() & Qt::TouchPointReleased) {
+d->releaseEvent(point.pos());
+}
+}
+}
+break;
+}
+case QEvent::TouchEnd: {
+QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+if (!point.isPrimary() && d->mMultiTouchEnabled) {
 d->releaseEvent(point.pos());
 }
 }
-}
+break;
-} else if (event->type() == QEvent::TouchEnd) {
+}
-QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+case QEvent::GraphicsSceneMousePress: {
-if (!point.isPrimary() && d->mMultiTouchEnabled) {
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-d->releaseEvent(point.pos());
+d->pressEvent(mouseEvent->pos());
-}
+break;
 }
-} else if (event->type() == QEvent::GraphicsSceneMousePress) {
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+case QEvent::GraphicsSceneMouseDoubleClick: {
-d->pressEvent(mouseEvent->pos());
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-} else if (event->type() == QEvent::GraphicsSceneMouseDoubleClick) {
+d->doublePressEvent(mouseEvent->pos());
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+break;
-d->doublePressEvent(mouseEvent->pos());
+}
-} else if (event->type() == QEvent::GraphicsSceneMouseMove) {
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+case QEvent::GraphicsSceneMouseMove: {
-d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-} else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
+d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+break;
-d->releaseEvent(mouseEvent->pos());
+}
-cancelButtonPress();
-} else {
+case QEvent::GraphicsSceneMouseRelease: {
-return HbWidget::event(event);
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+d->releaseEvent(mouseEvent->pos());
+cancelButtonPress();
+break;
+}
+default:
+return HbWidget::event(event);
 }
 return true;
 }
 /*!
 {
 Q_D(HbInputButtonGroup);
 ungrabMouse();
-for (int i = 0; i < d->mButtonData.count(); ++i) {
+// Cancel long press timers
-if (d->mButtonData.at(i)->state() == HbInputButton::ButtonStatePressed) {
+d->mLongPressButtons.clear();
-d->mButtonData.at(i)->setState(HbInputButton::ButtonStateReleased);
+foreach (QTimer *timer, d->mLongPressTimers) {
-}
+delete timer;
-d->hideButtonPreview(d->mButtonData.at(i));
+}
+d->mLongPressTimers.clear();
-if (d->mLongPressButtons.contains(i)) {
-int listIndex = d->mLongPressButtons.indexOf(i);
+// Release all buttons and close previews
-delete d->mLongPressTimers.at(listIndex);
+foreach (HbInputButton *button, d->mButtonData) {
-d->mLongPressTimers.removeAt(listIndex);
+if (button->state() == HbInputButton::ButtonStatePressed) {
-d->mLongPressButtons.removeAt(listIndex);
+button->setState(HbInputButton::ButtonStateReleased);
 }
+d->hideButtonPreview(button);
 }
 if (d->mCharacterSelectionPreview) {
 d->mCharacterSelectionPreview->hide();
 }

changeset 7	923ff622b8b9
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55