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

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbinputbuttongroup.h"
+#include "hbinputbuttongroup_p.h"
 #include <QPainter>
 #include <QTextLayout>
 #include <QGraphicsSceneMouseEvent>
 #include <QTouchEvent>
 #include <hbwidgetfeedback.h>
 #include <hbdeviceprofile.h>
 #include <hbinputregioncollector_p.h>
 #include "hbframedrawerpool_p.h"
-#include "hbinputbuttongroup.h"
-#include "hbinputbuttongroup_p.h"
 #include "hbinputbutton.h"
 /// @cond
 const QString HbNormalBackground("qtg_fr_input_btn_keypad_normal");
 const qreal HbPreviewMarginInUnits = 3;
 const qreal HbTouchAreaSizeInUnits = 8;
 HbInputButtonGroupPrivate::HbInputButtonGroupPrivate()
 : mUnitValue(0), mGridSize(1, 1), mButtonBorderSize(1.0), mEnabled(true),
 mButtonPreviewEnabled(false), mCharacterSelectionPreviewEnabled(false),
 mMultiTouchEnabled(true), mCharacterSelectionPreview(0), mBackground(0)
 {
 for (int i = 0; i < HbTextLayoutCount; ++i) {
 mTextLayouts.append(0);
 }
 {
 foreach(HbFrameDrawer *drawer, mButtonDrawers) {
 HbFrameDrawerPool::release(drawer);
 }
-foreach (HbInputButton *button, mButtonData) {
+foreach(HbInputButton *button, mButtonData) {
 delete button;
 }
 mButtonData.clear();
-foreach (QTextLayout *layout, mTextLayouts) {
+foreach(QTextLayout *layout, mTextLayouts) {
 delete layout;
 }
-foreach (QTimer *timer, mLongPressTimers) {
+foreach(QTimer *timer, mLongPressTimers) {
 delete timer;
 }
 delete mCharacterSelectionPreview;
 HbInputButton::HbInputButtonState state = static_cast<HbInputButton::HbInputButtonState>(i % HbInputButton::ButtonStateCount);
 mColors.append(HbColorScheme::color(buttonColor(type, state)));
 }
 }
-void HbInputButtonGroupPrivate::showButtonPreview(HbInputButton * const item)
+void HbInputButtonGroupPrivate::showButtonPreview(HbInputButton *const item)
 {
 Q_Q(HbInputButtonGroup);
 int index = mButtonData.indexOf(item);
 if (mButtonPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
 !mButtonPreview.contains(index)) {
 HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1));
 mButtonPreview.insert(index, group);
-QList<HbInputButton*> buttons;
+QList<HbInputButton *> buttons;
 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();
 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(HbInputButtonGroup::ButtonTextTypeLabel)));
 QFontMetricsF fontMetrics(font);
 qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
 qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue;
 if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
 group->setBackground(drawer);
 q->mainWindow()->scene()->addItem(group);
 }
 }
-void HbInputButtonGroupPrivate::hideButtonPreview(HbInputButton * const item)
+void HbInputButtonGroupPrivate::hideButtonPreview(HbInputButton *const item)
 {
 int index = mButtonData.indexOf(item);
 if (mButtonPreview.contains(index)) {
 delete mButtonPreview.take(index);
 }
 }
-void HbInputButtonGroupPrivate::showCharacterSelectionPreview(HbInputButton * const item)
+void HbInputButtonGroupPrivate::showCharacterSelectionPreview(HbInputButton *const item)
 {
 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);
 qreal margin = HbPreviewMarginInUnits * mUnitValue * 0.5;
 mCharacterSelectionPreview->setContentsMargins(margin, 0, margin, 0);
 }
 HbInputButtonGroup *group = new HbInputButtonGroup(QSize(item->mappedCharacters().count(), 1));
-QObject::connect(group, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(emitButtonPressed(const QKeyEvent&)));
+QObject::connect(group, SIGNAL(buttonPressed(const QKeyEvent &)), q, SLOT(emitButtonPressed(const QKeyEvent &)));
-QObject::connect(group, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(emitButtonDoublePressed(const QKeyEvent&)));
+QObject::connect(group, SIGNAL(buttonDoublePressed(const QKeyEvent &)), q, SLOT(emitButtonDoublePressed(const QKeyEvent &)));
-QObject::connect(group, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(emitButtonReleased(const QKeyEvent&)));
+QObject::connect(group, SIGNAL(buttonReleased(const QKeyEvent &)), q, SLOT(emitButtonReleased(const QKeyEvent &)));
-QObject::connect(group, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(emitButtonLongPressed(const QKeyEvent&)));
+QObject::connect(group, SIGNAL(buttonLongPressed(const QKeyEvent &)), q, SLOT(emitButtonLongPressed(const QKeyEvent &)));
-QObject::connect(group, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(emitPressedButtonChanged(const QKeyEvent&, const QKeyEvent&)));
+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();
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
-font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
+font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeLabel)));
 QFontMetricsF fontMetrics(font);
 qreal textWidth = fontMetrics.width(item->mappedCharacters());
 qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * item->mappedCharacters().count();
 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;
-QList<HbInputButton*> buttons;
+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);
 void HbInputButtonGroupPrivate::pressEvent(const QPointF &position, bool emitSignal)
 {
 Q_Q(HbInputButtonGroup);
 if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
 position.y() >= 0 && position.y() < q->boundingRect().height())) {
 return;
 }
 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), -1);
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
 if ((item->state() != HbInputButton::ButtonStateReleased &&
 item->state() != HbInputButton::ButtonStateLatched) ||
 (mCharacterSelectionPreview && mCharacterSelectionPreview->isVisible())) {
 if (item->state() == HbInputButton::ButtonStateDisabled) {
 startLongPress(index);
 }
 return;
 void HbInputButtonGroupPrivate::doublePressEvent(const QPointF &position, bool emitSignal)
 {
 Q_Q(HbInputButtonGroup);
 if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
 position.y() >= 0 && position.y() < q->boundingRect().height())) {
 return;
 }
 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), -1);
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
 if ((item->state() != HbInputButton::ButtonStateReleased &&
 item->state() != HbInputButton::ButtonStateLatched) ||
 (mCharacterSelectionPreview && mCharacterSelectionPreview->isVisible())) {
 if (item->state() == HbInputButton::ButtonStateDisabled) {
 startLongPress(index);
 }
 return;
 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()) {
 if (oldIndex != newIndex) {
 releaseEvent(oldPosition, false);
 pressEvent(newPosition, false);
 QString text;
 void HbInputButtonGroupPrivate::releaseEvent(const QPointF &position, bool emitSignal)
 {
 Q_Q(HbInputButtonGroup);
 if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
 position.y() >= 0 && position.y() < q->boundingRect().height())) {
 return;
 }
 int column = static_cast<int>(position.x() / (q->boundingRect().width() / mGridSize.width()));
 int row = static_cast<int>(position.y() / (q->boundingRect().height() / mGridSize.height()));
 if (index >= 0 && index < mButtonData.count()) {
 HbInputButton *item = mButtonData.at(index);
 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);
 QRectF touchArea = QRectF(position.x() - 0.5 * cellWidth, position.y() - 0.5 * cellHeight,
 HbTouchAreaSizeInUnits * mUnitValue, HbTouchAreaSizeInUnits * mUnitValue);
 qreal probabilities = 0;
-foreach (HbInputButton *button, mButtonData) {
+foreach(HbInputButton *button, mButtonData) {
 QRectF intersection = button->boundingRect().intersected(touchArea);
 if (intersection.isValid()) {
 qreal probability = intersection.width() * intersection.height() / (touchArea.width() * touchArea.height());
 probabilities += probability;
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
 int typeIndex = index % HbTextTypeCount / HbInputButton::ButtonStateCount;
 if (typeIndex == HbInputButton::ButtonTypeLabel) {
-font.setPixelSize(int(fontSize(ButtonTextTypeLabel)));
+font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeLabel)));
 } else {
-font.setPixelSize(int(fontSize(ButtonTextTypeSingle)));
+font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeSingle)));
 }
 mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
 QFontMetricsF fontMetrics(font);
 // Create text line for each button with primary text and correct type and state. Layout it
 // to correct position
 mTextLayouts.at(index)->beginLayout();
-foreach (HbInputButton *item, mButtonData) {
+foreach(HbInputButton *item, mButtonData) {
 int layoutIndex = item->type() * HbInputButton::ButtonStateCount + item->state() + HbTextTypeCount;
 if (!mEnabled) {
 layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled + HbTextTypeCount;
 }
 if (index == layoutIndex && !item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() &&
 item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull() &&
 item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
 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(item->text(HbInputButton::ButtonTextIndexPrimary).length());
 if (typeIndex == HbInputButton::ButtonTypeLabel) {
-layoutTextLine(ButtonTextTypeLabel, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+layoutTextLine(HbInputButtonGroup::ButtonTextTypeLabel, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 } else {
-layoutTextLine(ButtonTextTypeSingle, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+layoutTextLine(HbInputButtonGroup::ButtonTextTypeSingle, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 }
 }
 }
 mTextLayouts.at(index)->endLayout();
 mTextLayouts.at(index)->setCacheEnabled(true);
 {
 qreal cellWidth = size.width() / mGridSize.width();
 qreal cellHeight = size.height() / mGridSize.height();
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
-font.setPixelSize(int(fontSize(ButtonTextTypePrimary)));
+font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypePrimary)));
 mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
 QFontMetricsF fontMetrics(font);
 // Create text line for each button with primary text and correct type and state. Layout it
 // to correct position
 mTextLayouts.at(index)->beginLayout();
-foreach (HbInputButton *item, mButtonData) {
+foreach(HbInputButton *item, mButtonData) {
 int layoutIndex = item->type() * HbInputButton::ButtonStateCount + item->state();
 if (!mEnabled) {
 layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled;
 }
 if (index == layoutIndex && !item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() &&
 item->icon(HbInputButton::ButtonIconIndexPrimary).isNull() &&
 !(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
 item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull() &&
 item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
 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(item->text(HbInputButton::ButtonTextIndexPrimary).length());
-layoutTextLine(ButtonTextTypePrimary, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+layoutTextLine(HbInputButtonGroup::ButtonTextTypePrimary, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 }
 }
 mTextLayouts.at(index)->endLayout();
 mTextLayouts.at(index)->setCacheEnabled(true);
 }
 {
 qreal cellWidth = size.width() / mGridSize.width();
 qreal cellHeight = size.height() / mGridSize.height();
 QFont font = HbFontSpec(HbFontSpec::Primary).font();
-font.setPixelSize(int(fontSize(ButtonTextTypeSecondaryFirstRow)));
+font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow)));
 mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
 QFontMetricsF fontMetrics(font);
 // Create text line for each button with secondary first row or second row text and correct type and state.
 // Layout it to correct position
 mTextLayouts.at(index)->beginLayout();
-foreach (HbInputButton *item, mButtonData) {
+foreach(HbInputButton *item, mButtonData) {
 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() &&
 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(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).length());
-layoutTextLine(ButtonTextTypeSecondaryFirstRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+layoutTextLine(HbInputButtonGroup::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(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).length());
-layoutTextLine(ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+layoutTextLine(HbInputButtonGroup::ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
 }
 }
 }
 mTextLayouts.at(index)->endLayout();
 mTextLayouts.at(index)->setCacheEnabled(true);
 }
-void HbInputButtonGroupPrivate::layoutTextLine(HbInputButtonTextType textType, const HbInputButton *button, const QSizeF &cellSize,
+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 == ButtonTextTypeSingle ||
+if (textType == HbInputButtonGroup::ButtonTextTypeSingle ||
-textType == ButtonTextTypeLabel) {
+textType == HbInputButtonGroup::ButtonTextTypeLabel) {
 textPositionX = (button->position().x() + 0.5 * button->size().width()) * cellSize.width() - 0.5 * textSize.width();
 textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
-} else if (textType == ButtonTextTypePrimary) {
+} else if (textType == HbInputButtonGroup::ButtonTextTypePrimary) {
 textPositionX = button->position().x() * cellSize.width() + HbHorizontalMarginInUnits * mUnitValue + mButtonBorderSize;
 textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
-} else if (textType == ButtonTextTypeSecondaryFirstRow) {
+} else if (textType == HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow) {
 textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
 textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
 textPositionY = (button->position().y() + button->size().height()) * cellSize.height() -
 textSize.height() - HbVerticalMarginInUnits * mUnitValue - mButtonBorderSize;
-} else if (textType == ButtonTextTypeSecondarySecondRow) {
+} else if (textType == 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;
 }
 textLine.setPosition(QPointF(textPositionX, textPositionY));
 }
 }
 }
 return QString("");
 }
-qreal HbInputButtonGroupPrivate::fontSize(HbInputButtonTextType textType)
+qreal HbInputButtonGroupPrivate::fontSize(HbInputButtonGroup::HbInputButtonTextType textType)
 {
-if (textType == ButtonTextTypeSingle) {
+if (textType == HbInputButtonGroup::ButtonTextTypeSingle) {
 return HbTextSizeInUnits * mUnitValue;
-} else if (textType == ButtonTextTypePrimary) {
+} else if (textType == HbInputButtonGroup::ButtonTextTypePrimary) {
 return HbPrimaryTextSizeInUnits * mUnitValue;
-} else if (textType == ButtonTextTypeSecondaryFirstRow ||
+} else if (textType == HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow ||
-textType == ButtonTextTypeSecondarySecondRow) {
+textType == HbInputButtonGroup::ButtonTextTypeSecondarySecondRow) {
 return HbSecondaryTextSizeInUnits * mUnitValue;
-} else if (textType == ButtonTextTypeLabel) {
+} else if (textType == HbInputButtonGroup::ButtonTextTypeLabel) {
 return HbLabelTextSizeInUnits * mUnitValue;
 }
 return 0;
 }
 /*!
 Constructor
 */
 HbInputButtonGroup::HbInputButtonGroup(QGraphicsItem *parent)
 : HbWidget(*new HbInputButtonGroupPrivate, parent)
 {
 Q_D(HbInputButtonGroup);
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
+setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Constructor
 */
 HbInputButtonGroup::HbInputButtonGroup(HbInputButtonGroupPrivate &dd, QGraphicsItem *parent)
 : HbWidget(dd, parent)
 {
 Q_D(HbInputButtonGroup);
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
+setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Constructor
 */
 HbInputButtonGroup::HbInputButtonGroup(const QSize &size, QGraphicsItem *parent)
 : HbWidget(*new HbInputButtonGroupPrivate, parent)
 {
 Q_D(HbInputButtonGroup);
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
 setGridSize(size);
+setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Constructor
 */
 HbInputButtonGroup::HbInputButtonGroup(HbInputButtonGroupPrivate &dd, const QSize &size, QGraphicsItem *parent)
 : HbWidget(dd, parent)
 {
 Q_D(HbInputButtonGroup);
 d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 setAcceptedMouseButtons(Qt::LeftButton);
 setGridSize(size);
+setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 /*!
 Destructor
 */
 return d->mGridSize;
 }
 /*!
 Sets the button data and updates button group based on the new data.
 Takes ownership of the button items. Button items that are not in the new list
 will be destroyed.
 \sa buttons
 \sa button
 */
-void HbInputButtonGroup::setButtons(const QList<HbInputButton*> &data)
+void HbInputButtonGroup::setButtons(const QList<HbInputButton *> &data)
 {
 Q_D(HbInputButtonGroup);
-foreach (HbInputButton *button, d->mButtonData) {
+foreach(HbInputButton *button, d->mButtonData) {
 if (!data.contains(button)) {
 delete button;
 }
 }
 d->mButtonData = data;
 HbInputButton *item = d->mButtonData.at(index);
 if (item->keyCode() == keyCode) {
 break;
 }
 }
 setButton(data, index);
 }
 /*!
 Returns button data.
 Ownership of the returned button items is not transferred.
 \sa setButtons
 \sa setButton
 */
-QList<HbInputButton*> HbInputButtonGroup::buttons() const
+QList<HbInputButton *> HbInputButtonGroup::buttons() const
 {
 Q_D(const HbInputButtonGroup);
 return d->mButtonData;
 }
 \sa setButton
 */
 HbInputButton *HbInputButtonGroup::button(int column, int row) const
 {
 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), -1);
 }
 return button(index);
 */
 HbInputButton *HbInputButtonGroup::button(HbInputButton::HbInputButtonKeyCode keyCode) const
 {
 Q_D(const HbInputButtonGroup);
-foreach (HbInputButton *button, d->mButtonData) {
+foreach(HbInputButton *button, d->mButtonData) {
 if (button->keyCode() == keyCode) {
 return button;
 }
 }
 return 0;
 are mapped to buttons which keycode is equal or bigger than HbInputButtonKeyCustom.
 Ownership of the actions is not transferred.
 \sa customButtonActions
 */
-void HbInputButtonGroup::setCustomButtonActions(const QList<HbAction*> &actions)
+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) {
+foreach(HbAction *action, d->mCustomActions) {
 connect(action, SIGNAL(changed()), this, SLOT(updateCustomButtons()));
 connect(action, SIGNAL(destroyed(QObject *)), this, SLOT(_q_customActionDestroyed(QObject *)));
 }
 d->updateCustomActions();
 Returns current custom actions.
 Ownership of the actions is not transferred.
 \sa setCustomButtonActions
 */
-QList<HbAction*> HbInputButtonGroup::customButtonActions() const
+QList<HbAction *> HbInputButtonGroup::customButtonActions() const
 {
 Q_D(const HbInputButtonGroup);
 return d->mCustomActions;
 }
 \sa setMultiTouchEnabled
 */
 bool HbInputButtonGroup::isMultiTouchEnabled() const
 {
 Q_D(const HbInputButtonGroup);
 return d->mMultiTouchEnabled;
 }
 /*!
 Sets button group background graphics.
 {
 Q_D(HbInputButtonGroup);
 HbFrameDrawerPool::release(d->mBackground);
 d->mBackground = background;
+}
+/*!
+Returns font size for given text type
+*/
+qreal HbInputButtonGroup::fontSize(HbInputButtonTextType textType)
+{
+Q_D(HbInputButtonGroup);
+return d->fontSize(textType);
 }
 /*!
 Returns all possible buttons the user could have intended to press
 for the last registered touch along with their corresponding probabilities.
 }
 /*!
 Draws the button group.
 */
-void HbInputButtonGroup::paint(QPainter* painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void HbInputButtonGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
 Q_UNUSED(option);
 Q_UNUSED(widget);
 Q_D(HbInputButtonGroup);
 qreal width = item->size().width() * cellWidth - 2 * d->mButtonBorderSize;
 qreal height = item->size().height() * cellHeight - 2 * d->mButtonBorderSize;
 painter->save();
 painter->translate(x, y);
 d->mButtonDrawers.at(i)->paint(painter, QRectF(0, 0, width, height));
 painter->restore();
 }
 if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
 qreal x = item->position().x() * cellWidth;
 item->icon(HbInputButton::ButtonIconIndexPrimary).paint(painter, QRectF(x, y, width, height));
 }
 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;
 qreal width = HbSecondaryIconSizeInUnits * d->mUnitValue;
 qreal height = HbSecondaryIconSizeInUnits * d->mUnitValue;
 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);
 }
 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;
 qreal height = HbSecondaryIconSizeInUnits * d->mUnitValue;
 Qt::Alignment alignment = static_cast<Qt::Alignment>(Qt::AlignVCenter | Qt::AlignRight);
 event->ignore();
 return false;
 }
 if (event->type() == QEvent::TouchBegin) {
-QTouchEvent *touchEvent = static_cast<QTouchEvent*>(event);
+QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-foreach (QTouchEvent::TouchPoint point, touchEvent->touchPoints()) {
+foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
 if (!point.isPrimary() && d->mMultiTouchEnabled) {
 d->pressEvent(point.pos());
 }
 }
 } else if (event->type() == QEvent::TouchUpdate) {
-QTouchEvent *touchEvent = static_cast<QTouchEvent*>(event);
+QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-foreach (QTouchEvent::TouchPoint point, touchEvent->touchPoints()) {
+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());
 d->releaseEvent(point.pos());
 }
 }
 }
 } else if (event->type() == QEvent::TouchEnd) {
-QTouchEvent *touchEvent = static_cast<QTouchEvent*>(event);
+QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-foreach (QTouchEvent::TouchPoint point, touchEvent->touchPoints()) {
+foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
 if (!point.isPrimary() && d->mMultiTouchEnabled) {
 d->releaseEvent(point.pos());
 }
 }
 } else if (event->type() == QEvent::GraphicsSceneMousePress) {
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
 d->pressEvent(mouseEvent->pos());
 } else if (event->type() == QEvent::GraphicsSceneMouseDoubleClick) {
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
 d->doublePressEvent(mouseEvent->pos());
 } else if (event->type() == QEvent::GraphicsSceneMouseMove) {
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
 d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
 } else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
-QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
 d->releaseEvent(mouseEvent->pos());
 cancelButtonPress();
 } else {
 return HbWidget::event(event);
 }
 Updates theme graphics
 */
 void HbInputButtonGroup::changeEvent(QEvent *event)
 {
 Q_D(HbInputButtonGroup);
 if (event->type() == HbEvent::ThemeChanged) {
 if (d->mBackground) {
 d->mBackground->themeChanged();
 }
-foreach (HbFrameDrawer *drawer, d->mButtonDrawers) {
+foreach(HbFrameDrawer *drawer, d->mButtonDrawers) {
 drawer->themeChanged();
 }
 d->updateColorArray();

changeset 6	c3690ec91ef8
parent 5	627c4a0fd0e7
child 7	923ff622b8b9