equal
deleted
inserted
replaced
94 void task169808_setFloating(); |
94 void task169808_setFloating(); |
95 void task237438_setFloatingCrash(); |
95 void task237438_setFloatingCrash(); |
96 void task248604_infiniteResize(); |
96 void task248604_infiniteResize(); |
97 void task258459_visibilityChanged(); |
97 void task258459_visibilityChanged(); |
98 void taskQTBUG_1665_closableChanged(); |
98 void taskQTBUG_1665_closableChanged(); |
|
99 void taskQTBUG_9758_undockedGeometry(); |
99 }; |
100 }; |
100 |
101 |
101 // Testing get/set functions |
102 // Testing get/set functions |
102 void tst_QDockWidget::getSetCheck() |
103 void tst_QDockWidget::getSetCheck() |
103 { |
104 { |
651 mw.splitDockWidget(&dw2, &dw, Qt::Horizontal); |
652 mw.splitDockWidget(&dw2, &dw, Qt::Horizontal); |
652 QCOMPARE(spy.count(), 1); |
653 QCOMPARE(spy.count(), 1); |
653 QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)), |
654 QCOMPARE(qvariant_cast<Qt::DockWidgetArea>(spy.at(0).at(0)), |
654 Qt::TopDockWidgetArea); |
655 Qt::TopDockWidgetArea); |
655 spy.clear(); |
656 spy.clear(); |
656 |
657 |
657 dw.setFloating(true); |
658 dw.setFloating(true); |
658 QTest::qWait(100); |
659 QTest::qWait(100); |
659 dw.setFloating(false); |
660 dw.setFloating(false); |
660 QTest::qWait(100); |
661 QTest::qWait(100); |
661 QCOMPARE(spy.count(), 1); |
662 QCOMPARE(spy.count(), 1); |
876 //now let's remove the closable attribute |
877 //now let's remove the closable attribute |
877 dock.setFeatures(dock.features() ^ QDockWidget::DockWidgetClosable); |
878 dock.setFeatures(dock.features() ^ QDockWidget::DockWidgetClosable); |
878 QVERIFY(!(dock.windowFlags() & Qt::WindowCloseButtonHint)); |
879 QVERIFY(!(dock.windowFlags() & Qt::WindowCloseButtonHint)); |
879 } |
880 } |
880 |
881 |
|
882 void tst_QDockWidget::taskQTBUG_9758_undockedGeometry() |
|
883 { |
|
884 QMainWindow window; |
|
885 QDockWidget dock1(&window); |
|
886 QDockWidget dock2(&window); |
|
887 window.addDockWidget(Qt::RightDockWidgetArea, &dock1); |
|
888 window.addDockWidget(Qt::RightDockWidgetArea, &dock2); |
|
889 window.tabifyDockWidget(&dock1, &dock2); |
|
890 dock1.hide(); |
|
891 dock2.hide(); |
|
892 window.show(); |
|
893 QTest::qWaitForWindowShown(&window); |
|
894 dock1.setFloating(true); |
|
895 dock1.show(); |
|
896 QTest::qWaitForWindowShown(&dock1); |
|
897 |
|
898 QVERIFY(dock1.x() >= 0); |
|
899 QVERIFY(dock1.y() >= 0); |
|
900 } |
|
901 |
|
902 |
881 |
903 |
882 QTEST_MAIN(tst_QDockWidget) |
904 QTEST_MAIN(tst_QDockWidget) |
883 #include "tst_qdockwidget.moc" |
905 #include "tst_qdockwidget.moc" |