FCL/sf/mw/hb: comparison src/hbcore/gui/hbpopupmanager.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include "hbmenu_p.h"
 #include <QGraphicsWidget>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsLayout>
-#include <QDebug>
 #include <QEvent>
+extern const char* KPositionManagedByVKB;
 HbPopupLayoutSpacer::HbPopupLayoutSpacer( QGraphicsItem *parent )
 : HbWidgetBase( parent )
 {
-#if QT_VERSION >= 0x040600
 setFlag(QGraphicsItem::ItemHasNoContents, true);
-#endif
 setAcceptedMouseButtons(Qt::NoButton);
 }
 QSizeF HbPopupLayoutSpacer::sizeHint(Qt::SizeHint which, const QSizeF &constraint ) const
 {
 return QSizeF( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
 }
 return QSizeF(0.f,0.f);
 }
-/*
-\reimp
-*/
-void HbPopupLayoutSpacer::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget )
-{
-Q_UNUSED(option)
-Q_UNUSED(widget);
-Q_UNUSED(painter);
-}
 HbPopupLayoutProxy::HbPopupLayoutProxy( HbPopup *popup, QGraphicsItem *parent )
 : HbWidgetBase(parent), mPopup(popup)
 {
-#if QT_VERSION >= 0x040600
 setFlag(QGraphicsItem::ItemHasNoContents, true);
-#endif
 setAcceptedMouseButtons(Qt::NoButton);
 popup->installEventFilter(this);
 }
 QSizeF HbPopupLayoutProxy::sizeHint(Qt::SizeHint which, const QSizeF &constraint ) const
 return QSizeF(0, 0);
 }
 void HbPopupLayoutProxy::setGeometry(const QRectF &rect)
 {
 if (!mPopup.isNull()) {
 const QSizeF popupPreferredSize =
 mPopup->effectiveSizeHint(Qt::PreferredSize);
 const QSizeF usedSize( qMin(rect.width(),   popupPreferredSize.width() ),
 qMin( rect.height(), popupPreferredSize.height() ) );
 QPointF usedPos(rect.left(), rect.top());
 case HbPopup::RightEdgeCenter:
 usedx = qMin(x-uw, pw-uw);
 usedy = qMin(y-uh/2, ph-uh);
 break;
 case HbPopup::BottomEdgeCenter:
+{
 usedx = qMin(x-uw/2, pw-uw);
-usedy = qMin(y-uh, ph-uh);
+HbMenu *menu = qobject_cast<HbMenu*>(mPopup);
+if(menu && ((y-uh) < 0)) {
+usedy = qMin(y,ph-uh);
+}
+else {
+usedy = qMin(y-uh, ph-uh);
+}
+}
 break;
 case HbPopup::LeftEdgeCenter:
 usedx = qMin(x, pw-uw);
 usedy = qMin(y-uh/2, ph-uh);
 break;
 break;
 default:
 //should not happen
 break;
 }
 if ( usedx < screenMargin ) usedx = screenMargin;
 if ( usedy < screenMargin ) usedy = screenMargin;
 usedPos = QPointF(usedx, usedy);
+}
+if (mPopup->isFullScreen()) {
+mPopup->setMaximumSize(parentItem()->boundingRect().width(), parentItem()->boundingRect().height());
+mPopup->setGeometry(0, 0, parentItem()->boundingRect().width(), parentItem()->boundingRect().height());
+((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = true;
+return;
 }
 if (((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting) {
 mPopup->setGeometry(QRectF(usedPos, usedSize));
+((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = true;
+} else if (mPopup->property(KPositionManagedByVKB).isValid() &&
+mPopup->property(KPositionManagedByVKB).toBool()) {
+//Special case for the popups which y-position is handled by VKB
+QPointF currentPos = mPopup->pos();
+currentPos.setX(usedPos.x());
+bool previousLayouting = ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting;
 ((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = true;
+mPopup->setGeometry(QRectF(currentPos, usedSize));
+((HbPopupPrivate*)HbPopupPrivate::d_ptr(mPopup))->mAutoLayouting = previousLayouting;
 } else {
 mPopup->resize(usedSize);
 }
 }
 }
 bool HbPopupLayoutProxy::eventFilter(QObject *obj, QEvent *event)
 {
 Q_UNUSED( obj );
 switch( event->type() ) {
 case QEvent::LayoutRequest:
-case QEvent::ContextMenu:
+{
+activateParentLayout();
+} //fallthrough
 case QEvent::Close:
 {
 updateGeometry();
 break;
 }
 break;
 }
 return false;
 }
+void HbPopupLayoutProxy::activateParentLayout()
-/*
+{
-\reimp
+if ( mPopup && parentLayoutItem() && parentLayoutItem()->isLayout()
-*/
+&& !static_cast<QGraphicsLayout*>(parentLayoutItem())->isActivated()) {
-void HbPopupLayoutProxy::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget )
+static_cast<QGraphicsLayout*>(parentLayoutItem())->activate();
-{
+}
-Q_UNUSED(option);
-Q_UNUSED(widget);
-Q_UNUSED(painter);
 }
 HbPopupLayoutManager::HbPopupLayoutManager( HbPopup *popup, QGraphicsScene *scene )
 : HbWidget()
 {
-#if QT_VERSION >= 0x040600
 setFlag(QGraphicsItem::ItemHasNoContents, true);
-#endif
 setAcceptedMouseButtons(Qt::NoButton);
 scene->addItem( this );
+//adjust the size of popuplayoutmanager to its preferredSize
+//since it defines the geometries of popups.
+adjustSize();
 // create proxy
 HbPopupLayoutProxy *childItem = new HbPopupLayoutProxy( popup, this );
 // create spacers
 HbStyle::setItemName( childItem, "menu" );
 }
 } else if ( metaObject->className() == QLatin1String("HbToolBarExtension" ) ) {
 HbStyle::setItemName( childItem, "toolbar-extension" );
 } else {
 HbStyle::setItemName( childItem, "popup" );
 }
 setZValue(popup->zValue() - 1);
 if ( metaObject->className() == QLatin1String("HbVolumeSliderPopup") ) {
 HbStyle::setItemName( childItem, "volumesliderpopup" );
 connect(scene,SIGNAL(sceneRectChanged(QRectF)),this,SLOT(orientationChanged(QRectF)));
 \reimp
 */
 void HbPopupLayoutManager::changeEvent(QEvent *event)
 {
 HbWidget::changeEvent(event);
-if (event && event->type() == QEvent::LayoutDirectionChange) {
+if (event->type() == QEvent::LayoutDirectionChange) {
 repolish();
 }
-}
-/*
-\reimp
-*/
-void HbPopupLayoutManager::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget )
-{
-Q_UNUSED(option)
-Q_UNUSED(widget);
-Q_UNUSED(painter);
 }
 /*
 \class HbPopupManagerPrivate
 Deliver mouseEvent to all HbPopupBackGround object for non-modal popups until event blocking
 item is found.
 */
 void HbPopupManagerPrivate::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
 {
-foreach (QGraphicsItem *item, scene->items(mouseEvent->scenePos())) {
+//This function can be removed since popup background is handling the events
+Q_UNUSED(mouseEvent);
+/*foreach (QGraphicsItem *item, scene->items(mouseEvent->scenePos())) {
 if (eventBlockItem(item)) {
 break;
 }
 if (item->type() == HbPrivate::ItemType_PopupBackGround) {
 static_cast<GraphicsItem *>(item)->sceneEvent(mouseEvent);
 // Finish loop if popup of background is modal
 if (static_cast<HbPopupBackGround *>(item)->isModal()) {
 break;
 }
 }
-}
+}*/
 }
 /*
 Returns true if item is an event blocking item.
 */
 popupCountRegisters[priority] = popupCountRegister;
 }
 void HbPopupManagerPrivate::eventHook(QEvent *event)
 {
-if (event && event->type() == QEvent::GraphicsSceneMouseRelease && popupList.count() && scene) {
+Q_UNUSED(event);
+//This function can be removed since popup background is handling the events
+/* if (event && event->type() == QEvent::GraphicsSceneMouseRelease && popupList.count() && scene) {
 mouseReleaseEvent(static_cast<QGraphicsSceneMouseEvent *>(event));
-}
+}*/
 }
 void HbPopupManagerPrivate::showPopup(HbPopup *popup)
 {
 if (popup) {
 popup->metaObject()->className() != QLatin1String("HbCharPreviewPane") &&
 popup->metaObject()->className() != QLatin1String("HbCandidateList") &&
 popup->metaObject()->className() != QLatin1String("HbExactWordPopup") &&
 popup->metaObject()->className() != QLatin1String("HbInputSmileyPicker") &&
 popup->metaObject()->className() != QLatin1String("Hb12KeyCustomKeypad") &&
-				 !popup->inherits("HbInputVkbWidget")) {
+!popup->inherits("HbInputVkbWidget")) {
 setGeometryForPopup( popup );
 }
 }
 // Check if popup is top level popup
 {
 //delete the layoutproxy and remove the popup from parentItems list
 //only if its in its destruction
 bool popupInDestruction = (HbPopupPrivate::d_ptr(popup))->inDestruction;
 if ( parentItems.contains( popup ) && (popupInDestruction)) {
-//HbPopupLayoutManager *parentItem = parentItems[popup];
+HbPopupLayoutManager *parentItem = parentItems[popup];
 parentItems.remove( popup );
-//delete parentItem;
+delete parentItem;
 }
 // Only execute if close if popup was in popupList before
 if (popupList.removeOne(popup)) {
 // Update popup count registers
 updateHash(HbPopupPrivate::d_ptr(popup)->priority(), popup->zValue());
 // Update fading
-updateFading(true);
+updateFading();
 // Find new top level popup
 if (topLevelFocusablePopup && topLevelFocusablePopup == popup) {
 topLevelFocusablePopup = 0;
 foreach (HbPopup *popup, popupList) {
 }
 bool wasActivePopup = true;
 // If the previous popup was an inactive panel, then it would not have
 // gained focused. So no need to set the focus to the next topmost popup.
-if (popup->isPanel() && !popup->isActive()) {
+if (popup->isPanel() && !HbPopupPrivate::d_ptr(popup)->mActivePopup) {
 wasActivePopup = false;
 }
 if (topLevelFocusablePopup && wasActivePopup ) {
 topLevelFocusablePopup->setFocus();
+if (HbPopupPrivate::d_ptr(topLevelFocusablePopup)->mActivePopup)
+topLevelFocusablePopup->setActive(true);
 }
 //TODO: this is not very efficient way of deciding if has already been deleted or not
 else if (initialFocusedItem && scene &&
 scene->items().contains(initialFocusedItem)) {
 }
 if (topFadingPopup) {
 HbMainWindowPrivate::d_ptr(mainWindow)->fadeScreen(
 HbPopupPrivate::d_ptr(topFadingPopup)->backgroundItem->zValue() - HbPrivate::FadingItemZValueUnit );
+} else {
+HbMainWindowPrivate::d_ptr(mainWindow)->unfadeScreen();
 }
 }
 }
 // Device wide fading change is requested
 // no need to delete d because it is child of this object
 }
 void HbPopupManager::eventHook(QEvent *event)
 {
-d->eventHook(event);
+//This function can be removed
+Q_UNUSED(event);
+//d->eventHook(event);
 }
 void HbPopupManager::showPopup(HbPopup *popup)
 {
 d->showPopup(popup);

changeset 34	ed14f46c0e55
parent 6	c3690ec91ef8