aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-09-09 14:57:31 +0200
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-09-10 20:20:10 +0200
commitd22769c728ff5b705acdc87c8c8ed20602ad48e3 (patch)
treeb2588671007fcafac7ac8abea8a8512f435baf4e
parent36b365040a18653b3c522ea573a506b955b6c4da (diff)
Beautify the qquickviewcomparison example
Remove the red rectangle. Change the background color to a gradient. (taken from rendercontrol) Disable the transparency checkbox everywhere but Linux since it usually will not work. (too much hassle with platform specifics like frameless windows, etc.) Change-Id: I21488386cddc5841a2bdc8104e7abb197b075b0d Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp4
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/test.qml25
2 files changed, 20 insertions, 9 deletions
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
index 51b2a27d44..9ff7f1beb4 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
@@ -105,8 +105,10 @@ MainWindow::MainWindow()
m_checkboxTransparent = new QCheckBox(tr("Transparent background in QQuickWidget"));
connect(m_radioWidget, &QCheckBox::toggled, m_checkboxTransparent, &QWidget::setEnabled);
+#ifdef Q_OS_LINUX
connect(m_checkboxTransparent, &QCheckBox::toggled, this, &MainWindow::onTransparentChanged);
layout->addWidget(m_checkboxTransparent);
+#endif
setLayout(layout);
@@ -184,7 +186,7 @@ void MainWindow::updateView()
if (m_currentRootObject) {
m_currentRootObject->setProperty("currentText", text);
m_currentRootObject->setProperty("multisample", m_checkboxMultiSample->isChecked());
- m_currentRootObject->setProperty("color", QColor(m_transparent ? Qt::transparent : Qt::darkCyan));
+ m_currentRootObject->setProperty("translucency", m_transparent);
}
m_overlayLabel->raise();
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/test.qml b/examples/quick/quickwidgets/qquickviewcomparison/test.qml
index 5e11c3bda9..9dc356558d 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/test.qml
+++ b/examples/quick/quickwidgets/qquickviewcomparison/test.qml
@@ -46,6 +46,23 @@ Rectangle {
id: root
property alias currentText: edit.text
property alias multisample: fbitem.multisample
+ property bool translucency: false
+
+ gradient: Gradient {
+ id: grad
+ GradientStop { position: 0; color: "steelblue" }
+ GradientStop { position: 1; color: "black" }
+ }
+
+ onTranslucencyChanged: {
+ if (translucency) {
+ root.color = "transparent";
+ root.gradient = null;
+ } else {
+ root.color = "white";
+ root.gradient = grad;
+ }
+ }
ParticleSystem {
anchors.fill: parent
@@ -91,14 +108,6 @@ Rectangle {
}
}
- Rectangle {
- width: 300
- height: 300
- anchors.centerIn: parent
- color: "red"
- NumberAnimation on rotation { from: 0; to: 360; duration: 20000; loops: Animation.Infinite; }
- }
-
FbItem {
id: fbitem
anchors.fill: parent