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

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
-#include <QDebug>
 #include <QPainter>
 #include <QTextLayout>
 #include <QGraphicsSceneMouseEvent>
 #include <QTouchEvent>
 #include <QTimer>
+#include <QApplication>
+#include <QInputContext>
 #include <hbmainwindow.h>
 #include <hbaction.h>
 #include <hbevent.h>
 #include <hbcolorscheme.h>
 #include <hbdialog.h>
 #include <hbframeitem.h>
 #include <hbwidgetfeedback.h>
 #include <hbdeviceprofile.h>
+#include <hbinputregioncollector_p.h>
 #include "hbframedrawerpool_p.h"
 #include "hbinputbuttongroup.h"
 #include "hbinputbuttongroup_p.h"
 #include "hbinputbutton.h"
 Q_Q(HbInputButtonGroup);
 int index = mButtonData.indexOf(item);
 if (mButtonPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
 !mButtonPreview.contains(index)) {
-HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1), q);
+HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1));
 mButtonPreview.insert(index, group);
 QList<HbInputButton*> buttons;
-HbInputButton *previewItem = new HbInputButton(item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode(), QPoint(0, 0));
+HbInputButton *previewItem = 0;
+if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+int keyCode = -1;
+if (!item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty()) {
+keyCode = item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode();
+}
+previewItem = new HbInputButton(keyCode, QPoint(0, 0));
+previewItem->setIcon(item->icon(HbInputButton::ButtonIconIndexPrimary), HbInputButton::ButtonIconIndexPrimary);
+} else if (!item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty()) {
+previewItem = new HbInputButton(item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode(), QPoint(0, 0));
+previewItem->setText(item->text(HbInputButton::ButtonTextIndexPrimary), HbInputButton::ButtonTextIndexPrimary);
+}
 previewItem->setType(HbInputButton::ButtonTypeLabel);
-previewItem->setText(item->text(HbInputButton::ButtonTextIndexPrimary), HbInputButton::ButtonTextIndexPrimary);
 buttons.append(previewItem);
 group->setButtons(buttons);
 qreal cellWidth = q->boundingRect().width() / mGridSize.width();
 qreal cellHeight = q->boundingRect().height() / mGridSize.height();
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
-	  font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
+font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
 QFontMetricsF fontMetrics(font);
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
 qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue;
-if (width < HbPreviewWidthInUnits * mUnitValue) {
+if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+width = item->boundingRect().width();
+} else if (width < HbPreviewWidthInUnits * mUnitValue) {
 width = HbPreviewWidthInUnits * mUnitValue;
 }
 qreal height = HbPreviewHeightInUnits * mUnitValue;
-qreal x = (item->position().x() + 0.5 * item->size().width()) * cellWidth - 0.5 * width;
+qreal x = q->scenePos().x() + (item->position().x() + 0.5 * item->size().width()) * cellWidth - 0.5 * width;
 if (x < 0) {
 x = 0;
 } else if (x + width > q->boundingRect().width()) {
 x = q->boundingRect().width() - width;
 }
-qreal y = item->position().y() * cellHeight - height;
+qreal y = q->scenePos().y() + item->position().y() * cellHeight - height;
 group->setGeometry(QRectF(x, y, width, height));
 if (q->parentItem()) {
 group->setZValue(q->parentItem()->zValue() + 1);
 }
 {
 Q_Q(HbInputButtonGroup);
 if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
 item->mappedCharacters().count() > 1) {
+HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
 mProbabilities.clear();
 q->cancelButtonPress();
 if (!mCharacterSelectionPreview) {
 mCharacterSelectionPreview = new HbDialog();
+HbInputRegionCollector::instance()->attach(mCharacterSelectionPreview);
 mCharacterSelectionPreview->setModal(true);
 mCharacterSelectionPreview->setBackgroundFaded(false);
 mCharacterSelectionPreview->setTimeout(HbPopup::NoTimeout);
 mCharacterSelectionPreview->setDismissPolicy(HbPopup::TapAnywhere);
 mCharacterSelectionPreview->setFlag(QGraphicsItem::ItemIsPanel, true);
 qreal cellWidth = q->boundingRect().width() / mGridSize.width();
 qreal cellHeight = q->boundingRect().height() / mGridSize.height();
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
-	  font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
+font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
 QFontMetricsF fontMetrics(font);
 qreal textWidth = fontMetrics.width(item->mappedCharacters());
 qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * item->mappedCharacters().count();
 qreal height = HbPreviewHeightInUnits * mUnitValue;
 }
 int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
 int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
-int index = mButtonGridPositions.value(QPair<int, int>(column, row));
+int index = mButtonGridPositions.value(QPair<int, int>(column, row), -1);
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
 if ((item->state() != HbInputButton::ButtonStateReleased &&
 }
 int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
 int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
-int index = mButtonGridPositions.value(QPair<int, int>(column, row));
+int index = mButtonGridPositions.value(QPair<int, int>(column, row), -1);
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
 if ((item->state() != HbInputButton::ButtonStateReleased &&
 int oldColumn = static_cast<int>(oldPosition.x() / (q->boundingRect().width() / mGridSize.width()));
 int oldRow = static_cast<int>(oldPosition.y() / (q->boundingRect().height() / mGridSize.height()));
 int newColumn = static_cast<int>(newPosition.x() / (q->boundingRect().width() / mGridSize.width()));
 int newRow = static_cast<int>(newPosition.y() / (q->boundingRect().height() / mGridSize.height()));
-int oldIndex = mButtonGridPositions.value(QPair<int, int>(oldColumn, oldRow));
+int oldIndex = mButtonGridPositions.value(QPair<int, int>(oldColumn, oldRow), -1);
-int newIndex = mButtonGridPositions.value(QPair<int, int>(newColumn, newRow));
+int newIndex = mButtonGridPositions.value(QPair<int, int>(newColumn, newRow), -1);
 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()) {
 }
 int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
 int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
-int index = mButtonGridPositions.value(QPair<int, int>(column, row));
+int index = mButtonGridPositions.value(QPair<int, int>(column, row), -1);
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
 cancelLongPress(index);
 if (emitSignal) {
 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 {
 calculateButtonProbabilities(position);
 QString text;
 QKeyEvent releaeEvent(QEvent::KeyRelease, item->keyCode(), Qt::NoModifier, text, true);
 q->emitButtonReleased(releaeEvent);
 QKeyEvent pressEvent(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
 q->emitButtonPressed(pressEvent);
 } else {
-if (mCharacterSelectionPreviewEnabled) {
+if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction && item->mappedCharacters().count() > 1) {
 showCharacterSelectionPreview(item);
-}
+} else {
+HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
-HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+delete timer;
-delete timer;
+QString text;
-QString text;
+if (item->type() == HbInputButton::ButtonTypeLabel) {
-if (item->type() == HbInputButton::ButtonTypeLabel) {
+text = item->text(HbInputButton::ButtonTextIndexPrimary);
-text = item->text(HbInputButton::ButtonTextIndexPrimary);
+}
-}
+QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
-QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
+q->emitButtonLongPressed(event);
-q->emitButtonLongPressed(event);
+}
 }
 }
 }
 void HbInputButtonGroupPrivate::calculateButtonProbabilities(const QPointF &position)
 item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
 qreal textHeight = fontMetrics.height();
 QTextLine line = mTextLayouts.at(index)->createLine();
-line.setNumColumns(1);
+line.setNumColumns(item->text(HbInputButton::ButtonTextIndexPrimary).length());
 if (typeIndex == HbInputButton::ButtonTypeLabel) {
 layoutTextLine(ButtonTextTypeLabel, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 } else {
 layoutTextLine(ButtonTextTypeSingle, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull())) {
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
 qreal textHeight = fontMetrics.height();
 QTextLine line = mTextLayouts.at(index)->createLine();
-line.setNumColumns(1);
+line.setNumColumns(item->text(HbInputButton::ButtonTextIndexPrimary).length());
 layoutTextLine(ButtonTextTypePrimary, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 }
 }
 mTextLayouts.at(index)->endLayout();
 item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow));
 qreal textHeight = fontMetrics.height();
 QTextLine line = mTextLayouts.at(index)->createLine();
-line.setNumColumns(1);
+line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).length());
 layoutTextLine(ButtonTextTypeSecondaryFirstRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 }
 if (!item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
 item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow));
 qreal textHeight = fontMetrics.height();
 QTextLine line = mTextLayouts.at(index)->createLine();
-line.setNumColumns(1);
+line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).length());
 layoutTextLine(ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 }
 }
 }
 mLongPressTimers.removeAt(listIndex);
 mLongPressButtons.removeAt(listIndex);
 }
 }
+void HbInputButtonGroupPrivate::_q_customActionDestroyed(QObject *object)
+{
+Q_Q(HbInputButtonGroup);
+HbAction *action = static_cast<HbAction *>(object);
+mCustomActions.removeAll(action);
+q->updateCustomButtons();
+}
 /// @endcond
 /*!
 Constructor
 */
 {
 Q_D(HbInputButtonGroup);
 int index = -1;
 if (d->mButtonGridPositions.contains(QPair<int, int>(column, row))) {
-index = d->mButtonGridPositions.value(QPair<int, int>(column, row));
+index = d->mButtonGridPositions.value(QPair<int, int>(column, row), -1);
 }
 setButton(data, index);
 }
 /*!
 {
 Q_D(const HbInputButtonGroup);
 int index = -1;
 if (d->mButtonGridPositions.contains(QPair<int, int>(column, row))) {
-index = d->mButtonGridPositions.value(QPair<int, int>(column, row));
+index = d->mButtonGridPositions.value(QPair<int, int>(column, row), -1);
 }
 return button(index);
 }
 /*!
 void HbInputButtonGroup::setCustomButtonActions(const QList<HbAction*> &actions)
 {
 Q_D(HbInputButtonGroup);
 disconnect(this, SLOT(updateCustomButtons()));
+disconnect(this, SLOT(_q_customActionDestroyed(QObject *)));
 d->mCustomActions = actions;
 foreach (HbAction *action, d->mCustomActions) {
 connect(action, SIGNAL(changed()), this, SLOT(updateCustomButtons()));
+connect(action, SIGNAL(destroyed(QObject *)), this, SLOT(_q_customActionDestroyed(QObject *)));
 }
 d->updateCustomActions();
 d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
 d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
 QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
 d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
 } else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
 QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
 d->releaseEvent(mouseEvent->pos());
+cancelButtonPress();
 } else {
 return HbWidget::event(event);
 }
 return true;
 }
 d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
 d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
 update();
 }
+#include "moc_hbinputbuttongroup.cpp"
 // End of file

changeset 5	627c4a0fd0e7
parent 3	11d3954df52a
child 6	c3690ec91ef8