diff options
Diffstat (limited to 'examples/webenginewidgets/cookiebrowser')
4 files changed, 26 insertions, 11 deletions
diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json index 4cb51436e..35d9cf0d7 100644 --- a/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json +++ b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json @@ -12,13 +12,13 @@ "LicenseId": "urn:dje:license:public-domain", "License": "Public Domain", "LicenseFile": "COPYING", - "Copyright": "Ulisse Perusin <uli.peru@gmail.com> -Steven Garrity <sgarrity@silverorange.com> -Lapo Calamandrei <calamandrei@gmail.com> -Ryan Collier <rcollier@novell.com> -Rodney Dawes <dobey@novell.com> -Andreas Nilsson <nisses.mail@home.se> -Tuomas Kuosmanen <tigert@tigert.com> -Garrett LeSage <garrett@novell.com> -Jakub Steiner <jimmac@novell.com>" + "Copyright": ["Ulisse Perusin <uli.peru@gmail.com>", + "Steven Garrity <sgarrity@silverorange.com>", + "Lapo Calamandrei <calamandrei@gmail.com>", + "Ryan Collier <rcollier@novell.com>", + "Rodney Dawes <dobey@novell.com>", + "Andreas Nilsson <nisses.mail@home.se>", + "Tuomas Kuosmanen <tigert@tigert.com>", + "Garrett LeSage <garrett@novell.com>", + "Jakub Steiner <jimmac@novell.com>"] } diff --git a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc index fe6d1b046..adc302779 100644 --- a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc +++ b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc @@ -3,6 +3,7 @@ /*! \example webenginewidgets/cookiebrowser + \examplecategory {Web Technologies} \title WebEngine Cookie Browser Example \ingroup webengine-widgetexamples \brief A cookie browser based on \QWE Widgets. diff --git a/examples/webenginewidgets/cookiebrowser/mainwindow.cpp b/examples/webenginewidgets/cookiebrowser/mainwindow.cpp index bf65870f8..67454a9f1 100644 --- a/examples/webenginewidgets/cookiebrowser/mainwindow.cpp +++ b/examples/webenginewidgets/cookiebrowser/mainwindow.cpp @@ -59,6 +59,7 @@ CookieWidget::CookieWidget(const QNetworkCookie &cookie, QWidget *parent): QWidg void CookieWidget::setHighlighted(bool enabled) { + m_isHighlighted = enabled; QPalette p = palette(); p.setColor(backgroundRole(), enabled ? p.alternateBase().color() : p.base().color()); setPalette(p); @@ -112,9 +113,18 @@ void MainWindow::handleCookieAdded(const QNetworkCookie &cookie) return; CookieWidget *widget = new CookieWidget(cookie); - widget->setHighlighted(m_cookies.count() % 2); m_cookies.append(cookie); - m_layout->insertWidget(0,widget); + // Check whether the first widget in the layout is highlighted. + // if it is highlighted, then do not highlight the new item. + CookieWidget *firstWidget = m_layout->count() + ? qobject_cast<CookieWidget *>(m_layout->itemAt(0)->widget()) + : nullptr; + if (firstWidget) { + widget->setHighlighted(!firstWidget->isHighlighted()); + } else { + widget->setHighlighted(false); + } + m_layout->insertWidget(0, widget); connect(widget, &CookieWidget::deleteClicked, [this, cookie, widget]() { m_store->deleteCookie(cookie); diff --git a/examples/webenginewidgets/cookiebrowser/mainwindow.h b/examples/webenginewidgets/cookiebrowser/mainwindow.h index 76fd7de3e..da0d438ca 100644 --- a/examples/webenginewidgets/cookiebrowser/mainwindow.h +++ b/examples/webenginewidgets/cookiebrowser/mainwindow.h @@ -29,9 +29,13 @@ class CookieWidget : public QWidget, public Ui_CookieWidget public: CookieWidget(const QNetworkCookie &cookie, QWidget *parent = nullptr); void setHighlighted(bool enabled); + bool isHighlighted() { return m_isHighlighted; } signals: void deleteClicked(); void viewClicked(); + +private: + bool m_isHighlighted = false; }; class MainWindow : public QMainWindow, public Ui_MainWindow |