Commit fd12fbcf332878ab6a5b6ef8f09804b8598faced

Jani Hautakangas <ext-jani.hautakangas @no…a.com>
Fri Feb 05 11:48:52 CET 2010

Tree SHA1: f879614
Parent SHA1: 79fb890 (s60 application loses normalGeometry when returning from fullscreen)
raw diff | raw patch

Whitespace/tab fixes.

Reviewed-by: Trust me

Diff rendering mode:
inline
side by side


1083	1083	setGeometry(qApp->desktop()->screenGeometry(this));
1084	1084	else if (newstate & Qt::WindowMaximized)
1085	1085	setGeometry(qApp->desktop()->availableGeometry(this));
1086		else
	1086	else
1087	1087	setGeometry(normalGeometry);
1088	1088
1089	1089	//restore normal geometry


9700	9700	layout->addWidget(button);
9701	9701	widget.setLayout(layout);
9702	9702	widget.show();
9703
	9703
9704	9704	const QRect normalGeometry = widget.normalGeometry();
9705	9705	const QRect fullScreenGeometry = qApp->desktop()->screenGeometry(&widget);
9706	9706	const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget);
9707	9707	CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
9708	9708	CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba();
9709
9710		//Enter
	9709
	9710	//Enter
9711	9711	widget.showNormal();
9712	9712	widget.showFullScreen();
9713	9713	QCOMPARE(widget.geometry(), fullScreenGeometry);
9714	9714	QVERIFY(!buttonGroup->IsVisible());
9715		QVERIFY(!statusPane->IsVisible());
9716
	9715	QVERIFY(!statusPane->IsVisible());
	9716
9717	9717	widget.showMaximized();
9718	9718	widget.showFullScreen();
9719	9719	QCOMPARE(widget.geometry(), fullScreenGeometry);
9720	9720	QVERIFY(!buttonGroup->IsVisible());
9721		QVERIFY(!statusPane->IsVisible());
9722
	9721	QVERIFY(!statusPane->IsVisible());
	9722
9723	9723	widget.showMinimized();
9724	9724	widget.showFullScreen();
9725	9725	QCOMPARE(widget.geometry(), fullScreenGeometry);
9726	9726	QVERIFY(!buttonGroup->IsVisible());
9727		QVERIFY(!statusPane->IsVisible());
9728
9729		//Exit
	9727	QVERIFY(!statusPane->IsVisible());
	9728
	9729	//Exit
9730	9730	widget.showFullScreen();
9731	9731	widget.showNormal();
9732	9732	QCOMPARE(widget.geometry(), normalGeometry);
9733	9733	QVERIFY(buttonGroup->IsVisible());
9734		QVERIFY(statusPane->IsVisible());
	9734	QVERIFY(statusPane->IsVisible());
9735	9735
9736	9736	widget.showFullScreen();
9737	9737	widget.showMaximized();
9738	9738	QCOMPARE(widget.geometry(), maximumScreenGeometry);
9739	9739	QVERIFY(buttonGroup->IsVisible());
9740		QVERIFY(statusPane->IsVisible());
	9740	QVERIFY(statusPane->IsVisible());
9741	9741
9742	9742	widget.showFullScreen();
9743	9743	widget.showMinimized();
9744	9744	QCOMPARE(widget.geometry(), fullScreenGeometry);
9745	9745	QVERIFY(!buttonGroup->IsVisible());
9746		QVERIFY(!statusPane->IsVisible());
	9746	QVERIFY(!statusPane->IsVisible());
9747	9747	}
9748	9748
9749	9749	void tst_QWidget::maximizedWindowModeTransitions()
…	…
9760	9760	const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget);
9761	9761	CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
9762	9762	CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba();
9763
	9763
9764	9764	//Enter
9765	9765	widget.showNormal();
9766	9766	widget.showMaximized();
9767	9767	QCOMPARE(widget.geometry(), maximumScreenGeometry);
9768	9768	QVERIFY(buttonGroup->IsVisible());
9769		QVERIFY(statusPane->IsVisible());
9770
	9769	QVERIFY(statusPane->IsVisible());
	9770
9771	9771	widget.showFullScreen();
9772	9772	widget.showMaximized();
9773	9773	QCOMPARE(widget.geometry(), maximumScreenGeometry);
9774	9774	QVERIFY(buttonGroup->IsVisible());
9775		QVERIFY(statusPane->IsVisible());
9776
	9775	QVERIFY(statusPane->IsVisible());
	9776
9777	9777	widget.showMinimized();
9778	9778	widget.showMaximized();
9779	9779	QCOMPARE(widget.geometry(), maximumScreenGeometry);
9780	9780	QVERIFY(buttonGroup->IsVisible());
9781		QVERIFY(statusPane->IsVisible());
9782
	9781	QVERIFY(statusPane->IsVisible());
	9782
9783	9783	//Exit
9784	9784	widget.showMaximized();
9785	9785	widget.showNormal();
9786	9786	QCOMPARE(widget.geometry(), normalGeometry);
9787	9787	QVERIFY(buttonGroup->IsVisible());
9788		QVERIFY(statusPane->IsVisible());
	9788	QVERIFY(statusPane->IsVisible());
9789	9789
9790	9790	widget.showMaximized();
9791	9791	widget.showFullScreen();
9792	9792	QCOMPARE(widget.geometry(), fullScreenGeometry);
9793	9793	QVERIFY(!buttonGroup->IsVisible());
9794		QVERIFY(!statusPane->IsVisible());
	9794	QVERIFY(!statusPane->IsVisible());
9795	9795
9796	9796	widget.showMaximized();
9797	9797	widget.showMinimized();
…	…
9799	9799	// than with decoration visible. Altual size does not really matter since widget is invisible.
9800	9800	QCOMPARE(widget.geometry(), qApp->desktop()->availableGeometry(&widget));
9801	9801	QVERIFY(!buttonGroup->IsVisible());
9802		QVERIFY(!statusPane->IsVisible());
	9802	QVERIFY(!statusPane->IsVisible());
9803	9803	}
9804	9804
9805	9805	void tst_QWidget::minimizedWindowModeTransitions()
…	…
9810	9810	layout->addWidget(button);
9811	9811	widget.setLayout(layout);
9812	9812	widget.show();
9813
	9813
9814	9814	const QRect normalGeometry = widget.normalGeometry();
9815	9815	const QRect fullScreenGeometry = qApp->desktop()->screenGeometry(&widget);
9816	9816	const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget);
9817	9817	CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
9818	9818	CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba();
9819
	9819
9820	9820	//Enter
9821	9821	widget.showNormal();
9822	9822	widget.showMinimized();
9823	9823	QCOMPARE(widget.geometry(), normalGeometry);
9824	9824	QVERIFY(!buttonGroup->IsVisible());
9825		QVERIFY(!statusPane->IsVisible());
9826
	9825	QVERIFY(!statusPane->IsVisible());
	9826
9827	9827	widget.showFullScreen();
9828	9828	widget.showMinimized();
9829	9829	QCOMPARE(widget.geometry(), fullScreenGeometry);
9830	9830	QVERIFY(!buttonGroup->IsVisible());
9831		QVERIFY(!statusPane->IsVisible());
9832
	9831	QVERIFY(!statusPane->IsVisible());
	9832
9833	9833	widget.showMaximized();
9834	9834	widget.showMinimized();
9835	9835	// Since showMinimized hides window decoration availableGeometry gives different value
9836	9836	// than with decoration visible. Altual size does not really matter since widget is invisible.
9837	9837	QCOMPARE(widget.geometry(), qApp->desktop()->availableGeometry(&widget));
9838	9838	QVERIFY(!buttonGroup->IsVisible());
9839		QVERIFY(!statusPane->IsVisible());
	9839	QVERIFY(!statusPane->IsVisible());
9840	9840
9841	9841	//Exit
9842	9842	widget.showMinimized();
9843	9843	widget.showNormal();
9844	9844	QCOMPARE(widget.geometry(), normalGeometry);
9845	9845	QVERIFY(buttonGroup->IsVisible());
9846		QVERIFY(statusPane->IsVisible());
	9846	QVERIFY(statusPane->IsVisible());
9847	9847
9848	9848	widget.showMinimized();
9849	9849	widget.showFullScreen();
9850	9850	QCOMPARE(widget.geometry(), fullScreenGeometry);
9851	9851	QVERIFY(!buttonGroup->IsVisible());
9852		QVERIFY(!statusPane->IsVisible());
	9852	QVERIFY(!statusPane->IsVisible());
9853	9853
9854	9854	widget.showMinimized();
9855	9855	widget.showMaximized();
9856	9856	QCOMPARE(widget.geometry(), maximumScreenGeometry);
9857	9857	QVERIFY(buttonGroup->IsVisible());
9858		QVERIFY(statusPane->IsVisible());
	9858	QVERIFY(statusPane->IsVisible());
9859	9859	}
9860	9860
9861	9861	void tst_QWidget::normalWindowModeTransitions()
…	…
9866	9866	layout->addWidget(button);
9867	9867	widget.setLayout(layout);
9868	9868	widget.show();
9869
	9869
9870	9870	const QRect normalGeometry = widget.normalGeometry();
9871	9871	const QRect fullScreenGeometry = qApp->desktop()->screenGeometry(&widget);
9872	9872	const QRect maximumScreenGeometry = qApp->desktop()->availableGeometry(&widget);
9873	9873	CEikStatusPane *statusPane = CEikonEnv::Static()->AppUiFactory()->StatusPane();
9874	9874	CEikButtonGroupContainer *buttonGroup = CEikonEnv::Static()->AppUiFactory()->Cba();
9875
	9875
9876	9876	//Enter
9877	9877	widget.showMaximized();
9878	9878	widget.showNormal();
9879	9879	QCOMPARE(widget.geometry(), normalGeometry);
9880	9880	QVERIFY(buttonGroup->IsVisible());
9881		QVERIFY(statusPane->IsVisible());
9882
	9881	QVERIFY(statusPane->IsVisible());
	9882
9883	9883	widget.showFullScreen();
9884	9884	widget.showNormal();
9885	9885	QCOMPARE(widget.geometry(), normalGeometry);
9886	9886	QVERIFY(buttonGroup->IsVisible());
9887		QVERIFY(statusPane->IsVisible());
9888
	9887	QVERIFY(statusPane->IsVisible());
	9888
9889	9889	widget.showMinimized();
9890	9890	widget.showNormal();
9891	9891	QCOMPARE(widget.geometry(), normalGeometry);
9892	9892	QVERIFY(buttonGroup->IsVisible());
9893		QVERIFY(statusPane->IsVisible());
9894
	9893	QVERIFY(statusPane->IsVisible());
	9894
9895	9895	//Exit
9896	9896	widget.showNormal();
9897	9897	widget.showMaximized();
9898	9898	QCOMPARE(widget.geometry(), maximumScreenGeometry);
9899	9899	QVERIFY(buttonGroup->IsVisible());
9900		QVERIFY(statusPane->IsVisible());
	9900	QVERIFY(statusPane->IsVisible());
9901	9901
9902	9902	widget.showNormal();
9903	9903	widget.showFullScreen();
9904	9904	QCOMPARE(widget.geometry(), fullScreenGeometry);
9905	9905	QVERIFY(!buttonGroup->IsVisible());
9906		QVERIFY(!statusPane->IsVisible());
9907
	9906	QVERIFY(!statusPane->IsVisible());
	9907
9908	9908	widget.showNormal();
9909	9909	widget.showMinimized();
9910	9910	QCOMPARE(widget.geometry(), normalGeometry);
9911	9911	QVERIFY(!buttonGroup->IsVisible());
9912		QVERIFY(!statusPane->IsVisible());
	9912	QVERIFY(!statusPane->IsVisible());
9913	9913	}
9914	9914	#endif
9915	9915

Commit fd12fbcf332878ab6a5b6ef8f09804b8598faced

Gitorious