|
|
1c75053 |
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
|
|
|
1c75053 |
index 6645a37..e24cc8a 100644
|
|
|
1c75053 |
--- a/src/widgets/widgets/qlineedit_p.cpp
|
|
|
1c75053 |
+++ b/src/widgets/widgets/qlineedit_p.cpp
|
|
|
1c75053 |
@@ -329,7 +329,7 @@ void QLineEditIconButton::actionEvent(QActionEvent *e)
|
|
|
1c75053 |
switch (e->type()) {
|
|
|
1c75053 |
case QEvent::ActionChanged: {
|
|
|
1c75053 |
const QAction *action = e->action();
|
|
|
1c75053 |
- if (isVisible() != action->isVisible()) {
|
|
|
1c75053 |
+ if (isVisibleTo(parentWidget()) != action->isVisible()) {
|
|
|
1c75053 |
setVisible(action->isVisible());
|
|
|
1c75053 |
if (QLineEdit *le = qobject_cast<QLineEdit *>(parentWidget()))
|
|
|
1c75053 |
static_cast<QLineEditPrivate *>(qt_widget_private(le))->positionSideWidgets();
|
|
|
1c75053 |
@@ -433,13 +433,13 @@ void QLineEditPrivate::positionSideWidgets()
|
|
|
1c75053 |
QRect widgetGeometry(QPoint(QLineEditIconButton::IconMargin, (contentRect.height() - iconSize.height()) / 2), iconSize);
|
|
|
1c75053 |
foreach (const SideWidgetEntry &e, leftSideWidgetList()) {
|
|
|
1c75053 |
e.widget->setGeometry(widgetGeometry);
|
|
|
1c75053 |
- if (e.widget->isVisible())
|
|
|
1c75053 |
+ if (e.action->isVisible())
|
|
|
1c75053 |
widgetGeometry.moveLeft(widgetGeometry.left() + delta);
|
|
|
1c75053 |
}
|
|
|
1c75053 |
widgetGeometry.moveLeft(contentRect.width() - iconSize.width() - QLineEditIconButton::IconMargin);
|
|
|
1c75053 |
foreach (const SideWidgetEntry &e, rightSideWidgetList()) {
|
|
|
1c75053 |
e.widget->setGeometry(widgetGeometry);
|
|
|
1c75053 |
- if (e.widget->isVisible())
|
|
|
1c75053 |
+ if (e.action->isVisible())
|
|
|
1c75053 |
widgetGeometry.moveLeft(widgetGeometry.left() - delta);
|
|
|
1c75053 |
}
|
|
|
1c75053 |
}
|
|
|
1c75053 |
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
|
|
|
1c75053 |
index e6d63ee..1a5acbd 100644
|
|
|
1c75053 |
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
|
|
|
1c75053 |
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
|
|
|
1c75053 |
@@ -4319,10 +4319,10 @@ void tst_QLineEdit::clearButtonVisibleAfterSettingText_QTBUG_45518()
|
|
|
1c75053 |
#endif // QT_BUILD_INTERNAL
|
|
|
1c75053 |
}
|
|
|
1c75053 |
|
|
|
1c75053 |
-static inline QIcon sideWidgetTestIcon()
|
|
|
1c75053 |
+static inline QIcon sideWidgetTestIcon(Qt::GlobalColor color = Qt::yellow)
|
|
|
1c75053 |
{
|
|
|
1c75053 |
QImage image(QSize(20, 20), QImage::Format_ARGB32);
|
|
|
1c75053 |
- image.fill(Qt::yellow);
|
|
|
1c75053 |
+ image.fill(color);
|
|
|
1c75053 |
return QIcon(QPixmap::fromImage(image));
|
|
|
1c75053 |
}
|
|
|
1c75053 |
|
|
|
1c75053 |
@@ -4360,6 +4360,15 @@ void tst_QLineEdit::sideWidgets()
|
|
|
1c75053 |
lineEdit->addAction(iconAction);
|
|
|
1c75053 |
}
|
|
|
1c75053 |
|
|
|
1c75053 |
+template <class T> T *findAssociatedWidget(const QAction *a)
|
|
|
1c75053 |
+{
|
|
|
1c75053 |
+ foreach (QWidget *w, a->associatedWidgets()) {
|
|
|
1c75053 |
+ if (T *result = qobject_cast<T *>(w))
|
|
|
1c75053 |
+ return result;
|
|
|
1c75053 |
+ }
|
|
|
1c75053 |
+ return Q_NULLPTR;
|
|
|
1c75053 |
+}
|
|
|
1c75053 |
+
|
|
|
1c75053 |
void tst_QLineEdit::sideWidgetsActionEvents()
|
|
|
1c75053 |
{
|
|
|
1c75053 |
// QTBUG-39660, verify whether action events are handled by the widget.
|
|
|
1c75053 |
@@ -4369,27 +4378,43 @@ void tst_QLineEdit::sideWidgetsActionEvents()
|
|
|
1c75053 |
l->addWidget(lineEdit);
|
|
|
1c75053 |
l->addSpacerItem(new QSpacerItem(0, 50, QSizePolicy::Ignored, QSizePolicy::Fixed));
|
|
|
1c75053 |
QAction *iconAction = lineEdit->addAction(sideWidgetTestIcon(), QLineEdit::LeadingPosition);
|
|
|
1c75053 |
+ QAction *iconAction1 = lineEdit->addAction(sideWidgetTestIcon(Qt::red), QLineEdit::LeadingPosition);
|
|
|
1c75053 |
+ QAction *iconAction2 = lineEdit->addAction(sideWidgetTestIcon(Qt::blue), QLineEdit::LeadingPosition);
|
|
|
1c75053 |
+ QAction *iconAction3 = lineEdit->addAction(sideWidgetTestIcon(Qt::yellow), QLineEdit::LeadingPosition);
|
|
|
1c75053 |
+ iconAction3->setVisible(false);
|
|
|
1c75053 |
+
|
|
|
1c75053 |
testWidget.move(300, 300);
|
|
|
1c75053 |
testWidget.show();
|
|
|
1c75053 |
QVERIFY(QTest::qWaitForWindowExposed(&testWidget));
|
|
|
1c75053 |
|
|
|
1c75053 |
- QWidget *toolButton = Q_NULLPTR;
|
|
|
1c75053 |
- foreach (QWidget *w, iconAction->associatedWidgets()) {
|
|
|
1c75053 |
- if (qobject_cast<QToolButton *>(w)) {
|
|
|
1c75053 |
- toolButton = w;
|
|
|
1c75053 |
- break;
|
|
|
1c75053 |
- }
|
|
|
1c75053 |
- }
|
|
|
1c75053 |
- QVERIFY(toolButton);
|
|
|
1c75053 |
+ QWidget *toolButton1 = findAssociatedWidget<QToolButton>(iconAction1);
|
|
|
1c75053 |
+ QWidget *toolButton2 = findAssociatedWidget<QToolButton>(iconAction2);
|
|
|
1c75053 |
+ QWidget *toolButton3 = findAssociatedWidget<QToolButton>(iconAction3);
|
|
|
1c75053 |
+
|
|
|
1c75053 |
+ QVERIFY(toolButton1);
|
|
|
1c75053 |
+ QVERIFY(toolButton2);
|
|
|
1c75053 |
+ QVERIFY(toolButton3);
|
|
|
1c75053 |
+
|
|
|
1c75053 |
+ QVERIFY(!toolButton3->isVisible()); // QTBUG-48899 , action hidden before show().
|
|
|
1c75053 |
+
|
|
|
1c75053 |
+ QVERIFY(toolButton1->isVisible());
|
|
|
1c75053 |
+ QVERIFY(toolButton1->isEnabled());
|
|
|
1c75053 |
+
|
|
|
1c75053 |
+ QVERIFY(toolButton2->isVisible());
|
|
|
1c75053 |
+ QVERIFY(toolButton2->isEnabled());
|
|
|
1c75053 |
+
|
|
|
1c75053 |
+ const int toolButton1X = toolButton1->x();
|
|
|
1c75053 |
+ const int toolButton2X = toolButton2->x();
|
|
|
1c75053 |
+ QVERIFY(toolButton1X < toolButton2X); // QTBUG-48806, positioned beside each other.
|
|
|
1c75053 |
|
|
|
1c75053 |
- QVERIFY(toolButton->isVisible());
|
|
|
1c75053 |
- QVERIFY(toolButton->isEnabled());
|
|
|
1c75053 |
+ iconAction1->setEnabled(false);
|
|
|
1c75053 |
+ QVERIFY(!toolButton1->isEnabled());
|
|
|
1c75053 |
|
|
|
1c75053 |
- iconAction->setEnabled(false);
|
|
|
1c75053 |
- QVERIFY(!toolButton->isEnabled());
|
|
|
1c75053 |
+ iconAction1->setVisible(false);
|
|
|
1c75053 |
+ QVERIFY(!toolButton1->isVisible());
|
|
|
1c75053 |
|
|
|
1c75053 |
- iconAction->setVisible(false);
|
|
|
1c75053 |
- QVERIFY(!toolButton->isVisible());
|
|
|
1c75053 |
+ // QTBUG-39660, button 2 takes position of invisible button 1.
|
|
|
1c75053 |
+ QCOMPARE(toolButton2->x(), toolButton1X);
|
|
|
1c75053 |
}
|
|
|
1c75053 |
|
|
|
1c75053 |
Q_DECLARE_METATYPE(Qt::AlignmentFlag)
|