AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLineEdit: Fix visibility handling of side widgets.

Browse Source 
Compare against isVisibleTo() in QLineEditIconButton::actionEvent()
so that action events received before show() are handled correctly.

Fix a regression introduced by change
4dccb2ca67 for handling action
events causing side widgets to overlap when added before the widget was
shown. Use QAction::isVisible() to determine visibility.

Task-number: QTBUG-48806
Task-number: QTBUG-48899
Task-number: QTBUG-39660
Change-Id: I7a39a3b9a094f2c74cde09544f1158deb2b81cf2
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Friedemann Kleint 2015-10-19 16:24:50 +02:00
parent 344b19f8e9
commit 13b1c23f8b
2 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qlineedit_p.cpp
View File

@ -329,7 +329,7 @@ void QLineEditIconButton::actionEvent(QActionEvent *e)
switch (e->type()) {
case QEvent::ActionChanged: {
const QAction *action = e->action();
if (isVisible() != action->isVisible()) {
if (isVisibleTo(parentWidget()) != action->isVisible()) {
setVisible(action->isVisible());
if (QLineEdit *le = qobject_cast<QLineEdit *>(parentWidget()))
static_cast<QLineEditPrivate *>(qt_widget_private(le))->positionSideWidgets();
@ -433,13 +433,13 @@ void QLineEditPrivate::positionSideWidgets()
QRect widgetGeometry(QPoint(QLineEditIconButton::IconMargin, (contentRect.height() - iconSize.height()) / 2), iconSize);
foreach (const SideWidgetEntry &e, leftSideWidgetList()) {
e.widget->setGeometry(widgetGeometry);
if (e.widget->isVisible())
if (e.action->isVisible())
widgetGeometry.moveLeft(widgetGeometry.left() + delta);
}
widgetGeometry.moveLeft(contentRect.width() - iconSize.width() - QLineEditIconButton::IconMargin);
foreach (const SideWidgetEntry &e, rightSideWidgetList()) {
e.widget->setGeometry(widgetGeometry);
if (e.widget->isVisible())
if (e.action->isVisible())
widgetGeometry.moveLeft(widgetGeometry.left() - delta);
}
}

58
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
View File

@ -4319,10 +4319,10 @@ void tst_QLineEdit::clearButtonVisibleAfterSettingText_QTBUG_45518()
#endif // QT_BUILD_INTERNAL
}
static inline QIcon sideWidgetTestIcon()
static inline QIcon sideWidgetTestIcon(Qt::GlobalColor color = Qt::yellow)
{
QImage image(QSize(20, 20), QImage::Format_ARGB32);
image.fill(Qt::yellow);
image.fill(color);
return QIcon(QPixmap::fromImage(image));
}
@ -4360,6 +4360,15 @@ void tst_QLineEdit::sideWidgets()
lineEdit->addAction(iconAction);
}
template <class T> T *findAssociatedWidget(const QAction *a)
{
foreach (QWidget *w, a->associatedWidgets()) {
if (T *result = qobject_cast<T *>(w))
return result;
}
return Q_NULLPTR;
}
void tst_QLineEdit::sideWidgetsActionEvents()
{
// QTBUG-39660, verify whether action events are handled by the widget.
@ -4368,28 +4377,43 @@ void tst_QLineEdit::sideWidgetsActionEvents()
QLineEdit *lineEdit = new QLineEdit(&testWidget);
l->addWidget(lineEdit);
l->addSpacerItem(new QSpacerItem(0, 50, QSizePolicy::Ignored, QSizePolicy::Fixed));
QAction *iconAction = lineEdit->addAction(sideWidgetTestIcon(), QLineEdit::LeadingPosition);
QAction *iconAction1 = lineEdit->addAction(sideWidgetTestIcon(Qt::red), QLineEdit::LeadingPosition);
QAction *iconAction2 = lineEdit->addAction(sideWidgetTestIcon(Qt::blue), QLineEdit::LeadingPosition);
QAction *iconAction3 = lineEdit->addAction(sideWidgetTestIcon(Qt::yellow), QLineEdit::LeadingPosition);
iconAction3->setVisible(false);
testWidget.move(300, 300);
testWidget.show();
QVERIFY(QTest::qWaitForWindowExposed(&testWidget));
QWidget *toolButton = Q_NULLPTR;
foreach (QWidget *w, iconAction->associatedWidgets()) {
if (qobject_cast<QToolButton *>(w)) {
toolButton = w;
break;
}
}
QVERIFY(toolButton);
QWidget *toolButton1 = findAssociatedWidget<QToolButton>(iconAction1);
QWidget *toolButton2 = findAssociatedWidget<QToolButton>(iconAction2);
QWidget *toolButton3 = findAssociatedWidget<QToolButton>(iconAction3);
QVERIFY(toolButton->isVisible());
QVERIFY(toolButton->isEnabled());
QVERIFY(toolButton1);
QVERIFY(toolButton2);
QVERIFY(toolButton3);
iconAction->setEnabled(false);
QVERIFY(!toolButton->isEnabled());
QVERIFY(!toolButton3->isVisible()); // QTBUG-48899 , action hidden before show().
iconAction->setVisible(false);
QVERIFY(!toolButton->isVisible());
QVERIFY(toolButton1->isVisible());
QVERIFY(toolButton1->isEnabled());
QVERIFY(toolButton2->isVisible());
QVERIFY(toolButton2->isEnabled());
const int toolButton1X = toolButton1->x();
const int toolButton2X = toolButton2->x();
QVERIFY(toolButton1X < toolButton2X); // QTBUG-48806, positioned beside each other.
iconAction1->setEnabled(false);
QVERIFY(!toolButton1->isEnabled());
iconAction1->setVisible(false);
QVERIFY(!toolButton1->isVisible());
// QTBUG-39660, button 2 takes position of invisible button 1.
QCOMPARE(toolButton2->x(), toolButton1X);
}
Q_DECLARE_METATYPE(Qt::AlignmentFlag)