--- a/src/hbwidgets/widgets/hbcombobox_p.cpp Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.cpp Fri Sep 17 08:32:10 2010 +0300
@@ -272,24 +272,10 @@
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;
}
@@ -554,7 +540,6 @@
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 ) ) );
@@ -564,7 +549,6 @@
q, SLOT( _q_textChanged( QString ) ) );
q->setHandlesChildEvents( true );
mLineEdit->setReadOnly( true );
- mLineEdit->setLongPressEnabled( false );
setCompletion( false );
mLineEdit->setCursorVisibility( Hb::TextCursorHidden );
if( mModel && mModel->rowCount( ) ) {