FCL/sf/mw/hb: comparison src/hbwidgets/widgets/hbcombobox

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hbtextitem.h>
 #include <hbstyleoptioncombobox_p.h>
 #include <hbgraphicsscene.h>
+#include <hbinputeditorinterface.h>
 #include <QSortFilterProxyModel>
 #include <QCompleter>
 #include <QItemSelectionModel>
 #include <QApplication>
 if ( !mDropDown ) {
 return;
 }
-if ( !mDropDown->scene() || !mDropDown->scene( )->property( "destructed" ).isValid( ) ) {
+//if drop down is added to scene then remove it from scene so that scene does not deletes
-delete mDropDown;
+//drop down again
-mDropDown = 0;
+if( mDropDown->scene() ) {
-}
+q->scene()->removeItem(mDropDown);
+}
+delete mDropDown;
+mDropDown = 0;
 }
 void HbComboBoxPrivate::init( )
 {
 createPrimitives( );
 void HbComboBoxPrivate::createPrimitives( )
 {
 Q_Q( HbComboBox );
-mTextItem = q->style( )->createPrimitive( HbStyle::P_ComboBox_text, q );
+mTextItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_ComboBox_text, q );
 HbStyle::setItemName( mTextItem, "combobox_labelfield" );
-mBackgroundItem = q->style( )->createPrimitive( HbStyle::P_ComboBox_background, q );
+mBackgroundItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_ComboBox_background, q );
 HbStyle::setItemName( mBackgroundItem, "text_background" );
-mButton = q->style( )->createPrimitive( HbStyle::P_ComboBox_button, q );
+mButton = HbStylePrivate::createPrimitive( HbStylePrivate::P_ComboBox_button, q );
 HbStyle::setItemName( mButton, "combobox_button" );
-mButtonTouchAreaItem = q->style( )->createPrimitive( HbStyle::P_ComboBoxButton_toucharea, q );
+mButtonTouchAreaItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_ComboBoxButton_toucharea, q );
 static_cast<HbTouchArea*>( mButtonTouchAreaItem )->grabGesture( Qt::TapGesture );
 }
 void HbComboBoxPrivate::touchAreaPressEvent( )
 if ( q->count( ) > 0 ) {
 HbWidgetFeedback::triggered( q, Hb::InstantPressed );
 }
 mIsDown = true;
 q->updatePrimitives( );
-q->setProperty( "state", "pressed" );
+//Update the state only when valid model is there
+if ( mModel && mModel->rowCount( ) ) {
+q->setProperty( "state", "pressed" );
+}
 }
 void HbComboBoxPrivate::touchAreaReleaseEvent(  )
 {
 Q_Q( HbComboBox );
 }
 mDropDown->mList->scrollTo( mModel->index( 0, 0 ) );
 mDropDown->mList->setCurrentIndex(
 mModel->index( 0, 0 ), QItemSelectionModel::Select );
 }
+positionDropDown( );
 #ifdef HB_EFFECTS
 HbEffect::start( mDropDown, HB_DROPD0WN_ITEM_TYPE, "appear" );
 #endif
-positionDropDown( );
 }
 }
 void HbComboBoxPrivate::vkbOpened( )
 {
 mDropDown->mList->setCurrentIndex( mCurrentIndex, QItemSelectionModel::Select );
 } else {
 mDropDown->mList->scrollTo( aModel->index( 0, 0 ) );
 }
 positionDropDown( );
-mDropDown->setVisible( true );
+if( !mDropDown->isVisible( ) ) {
+mDropDown->setVisible( true );
+#ifdef HB_EFFECTS
+HbEffect::start( mDropDown, HB_DROPD0WN_ITEM_TYPE, "appear" );
+#endif
+}
 }
 }
 void HbComboBoxPrivate::createDropDown( )
 {
 delete temp;
 temp = 0;
 }
 }
+void HbComboBoxPrivate::resetGeometryChangeFlag( )
+{
+Q_Q( HbComboBox );
+QGraphicsWidget *p = q;
+if( widgetGeometryChange.count() > 0 ) {
+while ( p->parentWidget( ) ) {
+p = p->parentWidget( );
+if ( !widgetGeometryChange.value( p ) ) {
+//if earlier geometry change flag was disabled then disable this flag
+p->setFlag( QGraphicsItem::ItemSendsGeometryChanges, false );
+}
+}
+widgetGeometryChange.clear();
+}
+}
+void HbComboBoxPrivate::showDismissEffect( )
+{
+#ifdef HB_EFFECTS
+HbEffect::start( mDropDown, HB_DROPD0WN_ITEM_TYPE, "disappear", mDropDown, "dismissEffectFinished" );
+#else
+mDropDown->setVisible( false );
+#endif
+}
 void HbComboBoxPrivate::positionDropDown( )
 {
 Q_Q( HbComboBox );
 QRectF popupRect;
 QRectF sceneRect( QPointF( ), HbDeviceProfile::profile( q ).logicalSize( ) );
 QAbstractItemModel *model = mDropDown->mList->model( );
 calculateListItemHeight( );
 qreal totalHeightRequd = model->rowCount( ) * mListItemHeight;
 qreal maxPopupHeight = 0.0;
-//read the maximum rows in drop down for different orientation from css
+//calculate the maximum popup height for different orientation
 if( q->mainWindow( )->orientation( ) == Qt::Horizontal ) {
-if( mDropDownRowsInLandscape == -1 ) {
-HbStyleParameters params;
-q->style( )->parameters( params );
-params.addParameter( "max-rows-in-dropdown" );
-q->polish( params );
-mDropDownRowsInLandscape = params.value( "max-rows-in-dropdown" ).toInt( );
-}
 maxPopupHeight = mDropDownRowsInLandscape * mListItemHeight;
 } else if( q->mainWindow( )->orientation( ) == Qt::Vertical ) {
-if( mDropDownRowsInPortrait == -1 ) {
-HbStyleParameters params;
-q->style( )->parameters( params );
-params.addParameter( "max-rows-in-dropdown" );
-q->polish( params );
-mDropDownRowsInPortrait = params.value( "max-rows-in-dropdown" ).toInt( );
-}
 maxPopupHeight = mDropDownRowsInPortrait * mListItemHeight;
 }
 if ( totalHeightRequd < maxPopupHeight ) {
 maxPopupHeight = totalHeightRequd;
 }
 QSizeF popupSize = QSizeF( q->rect( ).width( ), maxPopupHeight );
 QPointF popupPos;
-if( !mDropDown->vkbOpened ) {
+HbEditorInterface editorInterface( q );
+HbVkbHost *host = editorInterface.vkbHost( );
+if( host && ( host->keypadStatus( ) == HbVkbHost::HbVkbStatusOpened ) ) {
+// case when vkb is visible
+// positioning drop down when vkb is positioned
+// drop down will come on top/below of combo based upon which side has more space
+// available
+QSizeF keyBoardArea = host->keyboardArea( );
+QSize screenSize = HbDeviceProfile::profile( q ).logicalSize( );
+qreal heightDifference = screenSize.height( ) - keyBoardArea.height( );
+qreal topSpace = widgetPos.y( );
+qreal bottomSpace = heightDifference - topSpace - q->boundingRect( ).height( );
+if( topSpace > bottomSpace ) {
+//display drop down at top
+if( widgetPos.y( ) - maxPopupHeight  > 0.0 ) {
+popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) - maxPopupHeight );
+} else {
+popupPos = QPointF( widgetPos.x( ), 0.0 );
+popupSize.setHeight( topSpace );
+}
+#ifdef HB_EFFECTS
+if ( !mHasUpEffect ) {
+mHasUpEffect = true;
+mHasDownEffect = false;
+//this Effect will be shown when there is more space in the view bottom.
+HbEffectInternal::add( mDropDown, "combo_appear_up", "appear" );
+HbEffectInternal::add( mDropDown, "combo_disappear_up", "disappear" );
+}
+#endif
+} else {
+//display drop down at bottom
+popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) + q->rect( ).height( ) );
+if( bottomSpace < maxPopupHeight ) {
+popupSize.setHeight( bottomSpace );
+}
+#ifdef HB_EFFECTS
+if ( !mHasDownEffect ) {
+mHasDownEffect = true;
+mHasUpEffect = false;
+//this Effect will be shown when there is more space in the view bottom.
+HbEffectInternal::add( mDropDown, "combo_appear_down", "appear" );
+HbEffectInternal::add( mDropDown, "combo_disappear_down", "disappear" );
+}
+#endif
+}
+} else {
+//this is the case when vkb is not visible
 //position of drop down in both editable and non-editable combobox depends upon
 //the available space above and below combobox
 if( ( widgetPos.y( ) + q->rect( ).height( ) + maxPopupHeight) < sceneRect.height( ) ) {
 popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) + q->rect( ).height( ) );
 #ifdef HB_EFFECTS
 if ( !mHasDownEffect ) {
 mHasDownEffect = true;
 mHasUpEffect = false;
-// this is temporary until proper effect theming comes.
 //this Effect will be shown when there is space in the view bottom.
 HbEffectInternal::add( mDropDown, "combo_appear_down", "appear" );
-HbEffectInternal::add( mDropDown, "combo_disappear_downl", "disappear" );
+HbEffectInternal::add( mDropDown, "combo_disappear_down", "disappear" );
 }
 #endif
 } else if( widgetPos.y( ) - maxPopupHeight  > 0.0 ) {
 popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) - maxPopupHeight );
 #ifdef HB_EFFECTS
 if ( !mHasUpEffect ) {
-// this is temporary until proper effect theming comes.
 //this Effect will be shown when there is no space in the view bottom
 mHasUpEffect = true;
 mHasDownEffect = false;
 HbEffectInternal::add( mDropDown, "combo_appear_up", "appear" );
 HbEffectInternal::add( mDropDown, "combo_disappear_up", "disappear" );
 popupPos = QPointF( widgetPos.x( ), 0.0 );
 #ifdef HB_EFFECTS
 if ( !mHasDownEffect ) {
 mHasDownEffect = true;
 mHasUpEffect = false;
-// this is temporary until proper effect theming comes.
 //this Effect will be shown when there is more space in the view bottom.
 HbEffectInternal::add( mDropDown, "combo_appear_down", "appear" );
 HbEffectInternal::add( mDropDown, "combo_disappear_down", "disappear" );
 }
 #endif
 popupPos = QPointF( widgetPos.x( ), sceneRect.height( ) - maxPopupHeight );
 #ifdef HB_EFFECTS
 if ( !mHasUpEffect ) {
 mHasUpEffect = true;
 mHasDownEffect = false;
-// this is temporary until proper effect theming comes.
 //this Effect will be shown when there is more space in the view bottom.
 HbEffectInternal::add( mDropDown, "combo_appear_up", "appear" );
 HbEffectInternal::add( mDropDown, "combo_disappear_up", "disappear" );
-}
-#endif
-}
-}
-} else {
-// positioning drop down when vkb is positioned
-// drop down will come on top/below of combo based upon which side has more space
-// available
-HbEditorInterface editorInterface( q );
-HbVkbHost *host = editorInterface.vkbHost( );
-if ( host ) {
-QSizeF keyBoardArea = host->keyboardArea( );
-QSize screenSize = HbDeviceProfile::profile( q ).logicalSize( );
-qreal heightDifference = screenSize.height( ) - keyBoardArea.height( );
-qreal topSpace = widgetPos.y( );
-qreal bottomSpace = heightDifference - topSpace - q->boundingRect( ).height( );
-if( topSpace > bottomSpace ) {
-//display drop down at top
-if( widgetPos.y( ) - maxPopupHeight  > 0.0 ) {
-popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) - maxPopupHeight );
-} else {
-popupPos = QPointF( widgetPos.x( ), 0.0 );
-popupSize.setHeight( topSpace );
-}
-#ifdef HB_EFFECTS
-if ( !mHasUpEffect ) {
-mHasUpEffect = true;
-mHasDownEffect = false;
-// this is temporary until proper effect theming comes.
-//this Effect will be shown when there is more space in the view bottom.
-HbEffectInternal::add( mDropDown, "combo_appear_up", "appear" );
-HbEffectInternal::add( mDropDown, "combo_disappear_up", "disappear" );
-}
-#endif
-} else {
-//display drop down at bottom
-popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) + q->rect( ).height( ) );
-if( bottomSpace < maxPopupHeight ) {
-popupSize.setHeight( bottomSpace );
-}
-#ifdef HB_EFFECTS
-if ( !mHasDownEffect ) {
-mHasDownEffect = true;
-mHasUpEffect = false;
-// this is temporary until proper effect theming comes.
-//this Effect will be shown when there is more space in the view bottom.
-HbEffectInternal::add( mDropDown, "combo_appear_down", "appear" );
-HbEffectInternal::add( mDropDown, "combo_disappear_down", "disappear" );
 }
 #endif
 }
 }
 }
 mDropDown->setMaximumSize( popupSize );
 mDropDown->setPos( popupPos );
 QGraphicsWidget *p = q;
 while ( p->parentWidget( ) ) {
 p = p->parentWidget( );
+//cache the original geometry change flag of parent widget
+QGraphicsItem::GraphicsItemFlags itemFlags = p->flags( );
+bool geometryFlagEnabled =  itemFlags & QGraphicsItem::ItemSendsGeometryChanges;
+widgetGeometryChange.insert(p, geometryFlagEnabled);
+//This flag is being set since geometry change notification is required for properly
+//positioning drop down when its visible and combobox position is changed for example
+//when orientation change happens.
+p->setFlag( QGraphicsItem::ItemSendsGeometryChanges );
 }
 mDropDown->setZValue( p->zValue( ) + 1 );
 }
 void HbComboBoxPrivate::_q_textChanged( const QModelIndex & aIndex )
 if( mLineEdit ) {
 mLineEdit->setText( mText );
 } else {
 HbStyleOptionComboBox comboBoxOption;
 q->initStyleOption( &comboBoxOption );
-q->style( )->updatePrimitive( mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption );
+HbStylePrivate::updatePrimitive( mTextItem, HbStylePrivate::P_ComboBox_text, &comboBoxOption );
 }
 mCurrentIndex = aIndex;
 } else {
 q->disconnect( mLineEdit, SIGNAL( textChanged ( QString ) ), q,
 SLOT( _q_textChanged( QString ) ) );
 mCurrentIndex = findData( mText );
 q->connect( mLineEdit, SIGNAL( textChanged ( QString ) ), q,
 SLOT( _q_textChanged( QString ) ) );
 }
 if ( mDropDown->isVisible( ) ) {
-mDropDown->setVisible( false );
+showDismissEffect( );
 q->setProperty( "state", "normal" );
 }
 currentIndexChanged( mCurrentIndex );
 }
 }
 }
 }
 } else {
 if( mDropDown ) {
-mDropDown->setVisible( false );
+showDismissEffect( );
 }
 //showPopup( mModel, mCurrentIndex);
 }
 emit q->editTextChanged( aString );
 }
 mLineEdit->backgroundItem( )->setVisible( false );
 }
 q->setHandlesChildEvents( false );
 mLineEdit->setReadOnly( false );
 mLineEdit->setCursorVisibility( Hb::TextCursorVisible );
-mLineEdit->setLongPressEnabled( );
 q->repolish( );
 q->connect( mLineEdit, SIGNAL( textChanged ( QString ) ),
 q, SLOT( _q_textChanged( QString ) ) );
 setCompletion( true );
 } else {
 q->disconnect( mLineEdit, SIGNAL( textChanged ( QString ) ),
 q, SLOT( _q_textChanged( QString ) ) );
 q->setHandlesChildEvents( true );
 mLineEdit->setReadOnly( true );
-mLineEdit->setLongPressEnabled( false );
 setCompletion( false );
 mLineEdit->setCursorVisibility( Hb::TextCursorHidden );
 if( mModel && mModel->rowCount( ) ) {
 QModelIndex mi = mModel->index( 0, 0 );
 if( mi.isValid( ) ) {
 if( mLineEdit ) {
 mLineEdit->setText( mText );
 } else {
 HbStyleOptionComboBox comboBoxOption;
 q->initStyleOption(&comboBoxOption);
-q->style( )->updatePrimitive(
+HbStylePrivate::updatePrimitive(
-mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption );
+mTextItem, HbStylePrivate::P_ComboBox_text, &comboBoxOption );
 }
 }
 currentIndexChanged( mCurrentIndex );
 }
 }

changeset 34	ed14f46c0e55
parent 7	923ff622b8b9