FCL/sf/mw/qt: comparison src/gui/widgets/qcombobox.cpp

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 Q_Q(QComboBox);
 if (lineEdit) {
 lineEdit->setText(QString());
 updateLineEditGeometry();
 }
+if (currentIndex.row() != indexBeforeChange)
+_q_emitCurrentIndexChanged(currentIndex);
 q->update();
 }
 void QComboBoxPrivate::_q_modelDestroyed()
 {
 if (minimumContentsLength > 0)
 sh.setWidth(qMax(sh.width(), minimumContentsLength * fm.width(QLatin1Char('X')) + (hasIcon ? iconSize.width() + 4 : 0)));
 // height
-sh.setHeight(qMax(fm.lineSpacing(), 14) + 2);
+sh.setHeight(qMax(fm.height(), 14) + 2);
 if (hasIcon) {
 sh.setHeight(qMax(sh.height(), iconSize.height() + 2));
 }
 // add style and strut values
 // we need a vertical layout
 QBoxLayout *layout =  new QBoxLayout(QBoxLayout::TopToBottom, this);
 layout->setSpacing(0);
 layout->setMargin(0);
-#ifdef QT_SOFTKEYS_ENABLED
-selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, this);
-cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Escape, this);
-addAction(selectAction);
-addAction(cancelAction);
-#endif
 // set item view
 setItemView(itemView);
 // add scroller arrows if style needs them
 view = 0;
 setItemView(new QComboBoxListView());
 }
 /*
-Sets currentIndex on entered if the LeftButton is not pressed. This
-means that if mouseTracking(...) is on, we setCurrentIndex and select
-even when LeftButton is not pressed.
-*/
-void QComboBoxPrivateContainer::setCurrentIndex(const QModelIndex &index)
-{
-if (QComboBoxDelegate::isSeparator(index))
-return;
-view->setCurrentIndex(index);
-}
-/*
 Returns the item view used for the combobox popup.
 */
 QAbstractItemView *QComboBoxPrivateContainer::itemView() const
 {
 return view;
 disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
 this, SLOT(updateScrollers()));
 disconnect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)),
 this, SLOT(updateScrollers()));
 #endif
-disconnect(view, SIGNAL(entered(QModelIndex)),
-this, SLOT(setCurrentIndex(QModelIndex)));
 disconnect(view, SIGNAL(destroyed()),
 this, SLOT(viewDestroyed()));
 delete view;
 view = 0;
 connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
 this, SLOT(updateScrollers()));
 connect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)),
 this, SLOT(updateScrollers()));
 #endif
-connect(view, SIGNAL(entered(QModelIndex)),
-this, SLOT(setCurrentIndex(QModelIndex)));
 connect(view, SIGNAL(destroyed()),
 this, SLOT(viewDestroyed()));
+#ifdef QT_SOFTKEYS_ENABLED
+selectAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::SelectSoftKey, Qt::Key_Select, itemView);
+cancelAction = QSoftKeyManager::createKeyedAction(QSoftKeyManager::CancelSoftKey, Qt::Key_Escape, itemView);
+addAction(selectAction);
+addAction(cancelAction);
+#endif
 }
 /*!
 Returns the spacing between the items in the view.
 */
 return true;
 default:
 break;
 }
 break;
-case QEvent::MouseMove: {
+case QEvent::MouseMove:
 if (isVisible()) {
 QMouseEvent *m = static_cast<QMouseEvent *>(e);
 QWidget *widget = static_cast<QWidget *>(o);
 QPoint vector = widget->mapToGlobal(m->pos()) - initialClickPosition;
 if (vector.manhattanLength() > 9 && blockMouseReleaseTimer.isActive())
 blockMouseReleaseTimer.stop();
+QModelIndex indexUnderMouse = view->indexAt(m->pos());
+if (indexUnderMouse.isValid() && indexUnderMouse != view->currentIndex()
+&& !QComboBoxDelegate::isSeparator(indexUnderMouse)) {
+view->setCurrentIndex(indexUnderMouse);
+}
 }
 break;
-}
 case QEvent::MouseButtonRelease: {
 QMouseEvent *m = static_cast<QMouseEvent *>(e);
 if (isVisible() && view->rect().contains(m->pos()) && view->currentIndex().isValid()
 && !blockMouseReleaseTimer.isActive()
 && (view->currentIndex().flags() & Qt::ItemIsEnabled)
 q->setFocusPolicy(Qt::WheelFocus);
 q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed,
 QSizePolicy::ComboBox));
 setLayoutItemMargins(QStyle::SE_ComboBoxLayoutItem);
 q->setModel(new QStandardItemModel(0, 1, q));
-q->setAttribute(Qt::WA_InputMethodEnabled);
+if (!q->isEditable())
+q->setAttribute(Qt::WA_InputMethodEnabled, false);
+else
+q->setAttribute(Qt::WA_InputMethodEnabled);
 }
 QComboBoxPrivateContainer* QComboBoxPrivate::viewContainer()
 {
 if (container)
 }
 q->update();
 }
 }
-void QComboBoxPrivate::_q_rowsAboutToBeInserted(const QModelIndex & parent,
-int /*start*/, int /*end*/)
-{
-if (parent != root)
-return;
-indexBeforeChange = currentIndex.row();
-}
 void QComboBoxPrivate::_q_rowsInserted(const QModelIndex &parent, int start, int end)
 {
 Q_Q(QComboBox);
 if (inserting || parent != root)
 return;
 q->update();
 _q_emitCurrentIndexChanged(currentIndex);
 }
 }
-void QComboBoxPrivate::_q_rowsAboutToBeRemoved(const QModelIndex &parent, int /*start*/, int /*end*/)
+void QComboBoxPrivate::_q_updateIndexBeforeChange()
 {
-if (parent != root)
-return;
 indexBeforeChange = currentIndex.row();
 }
 void QComboBoxPrivate::_q_rowsRemoved(const QModelIndex &parent, int /*start*/, int /*end*/)
 {
 editRect.size(), comboRect);
 }
 lineEdit->setGeometry(editRect);
 }
+Qt::MatchFlags QComboBoxPrivate::matchFlags() const
+{
+// Base how duplicates are determined on the autocompletion case sensitivity
+Qt::MatchFlags flags = Qt::MatchFixedString;
+#ifndef QT_NO_COMPLETER
+if (!lineEdit->completer() || lineEdit->completer()->caseSensitivity() == Qt::CaseSensitive)
+#endif
+flags |= Qt::MatchCaseSensitive;
+return flags;
+}
+void QComboBoxPrivate::_q_editingFinished()
+{
+Q_Q(QComboBox);
+if (lineEdit && !lineEdit->text().isEmpty()) {
+//here we just check if the current item was entered
+const int index = q_func()->findText(lineEdit->text(), matchFlags());
+if (index != -1 && itemText(currentIndex) != lineEdit->text()) {
+q->setCurrentIndex(index);
+emitActivated(currentIndex);
+}
+}
+}
 void QComboBoxPrivate::_q_returnPressed()
 {
 Q_Q(QComboBox);
 if (lineEdit && !lineEdit->text().isEmpty()) {
 if (q->count() >= maxCount && !(this->insertPolicy == QComboBox::InsertAtCurrent))
 lineEdit->end(false);
 QString text = lineEdit->text();
 // check for duplicates (if not enabled) and quit
 int index = -1;
 if (!duplicatesEnabled) {
-// Base how duplicates are determined on the autocompletion case sensitivity
+index = q->findText(text, matchFlags());
-Qt::MatchFlags flags = Qt::MatchFixedString;
-#ifndef QT_NO_COMPLETER
-if (!lineEdit->completer() || lineEdit->completer()->caseSensitivity() == Qt::CaseSensitive)
-#endif
-flags |= Qt::MatchCaseSensitive;
-index = q->findText(text, flags);
 if (index != -1) {
 q->setCurrentIndex(index);
 emitActivated(currentIndex);
 return;
 }
 d->lineEdit = edit;
 if (d->lineEdit->parent() != this)
 d->lineEdit->setParent(this);
 connect(d->lineEdit, SIGNAL(returnPressed()), this, SLOT(_q_returnPressed()));
+connect(d->lineEdit, SIGNAL(editingFinished()), this, SLOT(_q_editingFinished()));
 connect(d->lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(editTextChanged(QString)));
 #ifdef QT3_SUPPORT
 connect(d->lineEdit, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged(QString)));
 #endif
 d->lineEdit->setFrame(false);
 #endif
 if (d->model) {
 disconnect(d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
 this, SLOT(_q_dataChanged(QModelIndex,QModelIndex)));
 disconnect(d->model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
+this, SLOT(_q_updateIndexBeforeChange()));
 disconnect(d->model, SIGNAL(rowsInserted(QModelIndex,int,int)),
 this, SLOT(_q_rowsInserted(QModelIndex,int,int)));
 disconnect(d->model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
+this, SLOT(_q_updateIndexBeforeChange()));
 disconnect(d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
 this, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
 disconnect(d->model, SIGNAL(destroyed()),
 this, SLOT(_q_modelDestroyed()));
+disconnect(d->model, SIGNAL(modelAboutToBeReset()),
+this, SLOT(_q_updateIndexBeforeChange()));
 disconnect(d->model, SIGNAL(modelReset()),
 this, SLOT(_q_modelReset()));
 if (d->model->QObject::parent() == this)
 delete d->model;
 }
 d->model = model;
 connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
 this, SLOT(_q_dataChanged(QModelIndex,QModelIndex)));
 connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
-this, SLOT(_q_rowsAboutToBeInserted(QModelIndex,int,int)));
+this, SLOT(_q_updateIndexBeforeChange()));
 connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)),
 this, SLOT(_q_rowsInserted(QModelIndex,int,int)));
 connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
-this, SLOT(_q_rowsAboutToBeRemoved(QModelIndex,int,int)));
+this, SLOT(_q_updateIndexBeforeChange()));
 connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)),
 this, SLOT(_q_rowsRemoved(QModelIndex,int,int)));
 connect(model, SIGNAL(destroyed()),
 this, SLOT(_q_modelDestroyed()));
+connect(model, SIGNAL(modelAboutToBeReset()),
+this, SLOT(_q_updateIndexBeforeChange()));
 connect(model, SIGNAL(modelReset()),
 this, SLOT(_q_modelReset()));
 if (d->container)
 d->container->itemView()->setModel(model);
 if (indexChanged)
 currentIndex = QPersistentModelIndex(mi);
 if (lineEdit) {
 QString newText = q->itemText(currentIndex.row());
 if (lineEdit->text() != newText)
-lineEdit->setText(q->itemText(currentIndex.row()));
+lineEdit->setText(newText);
 updateLineEditGeometry();
 }
 if (indexChanged) {
 q->update();
 _q_emitCurrentIndexChanged(currentIndex);
 const bool updatesEnabled = container->updatesEnabled();
 #endif
 #if defined(Q_WS_WIN) && !defined(QT_NO_EFFECTS)
 bool scrollDown = (listRect.topLeft() == below);
 if (QApplication::isEffectEnabled(Qt::UI_AnimateCombo)
 && !style->styleHint(QStyle::SH_ComboBox_Popup, &opt, this) && !window()->testAttribute(Qt::WA_DontShowOnScreen))
 qScrollEffect(container, scrollDown ? QEffects::DownScroll : QEffects::UpScroll, 150);
 #endif
 // Don't disable updates on Mac OS X. Windows are displayed immediately on this platform,
 // which means that the window will be visible before the call to container->show() returns.
 // If updates are disabled at this point we'll miss our chance at painting the popup
 // menu before it's shown, causing flicker since the window then displays the standard gray
 // background.
 #ifndef Q_WS_MAC
 container->setUpdatesEnabled(false);
 #endif

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7
child 7	f7bc934e204c
child 18	2f34d5167611