From 0d5404b6fb693257f863d734e3b05997d162e14d Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 11 Nov 2022 12:35:19 +0000 Subject: [PATCH] Remove resize code from Map and ADS-B --- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 13 +------------ plugins/feature/map/mapgui.cpp | 15 +++------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index ff9a4a9ad..605bedcfb 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -3783,18 +3783,7 @@ void ADSBDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) (void) widget; (void) rollDown; - RollupContents *rollupContents = getRollupContents(); - - if (rollupContents->hasExpandableWidgets()) { - setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Expanding); - } else { - setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Fixed); - } - - int h = rollupContents->height() + getAdditionalHeight(); - resize(width(), h); - - rollupContents->saveState(m_rollupState); + getRollupContents()->saveState(m_rollupState); applySettings(); } diff --git a/plugins/feature/map/mapgui.cpp b/plugins/feature/map/mapgui.cpp index b28f6a5ed..c3dbb7677 100644 --- a/plugins/feature/map/mapgui.cpp +++ b/plugins/feature/map/mapgui.cpp @@ -163,18 +163,7 @@ void MapGUI::onWidgetRolled(QWidget* widget, bool rollDown) (void) widget; (void) rollDown; - RollupContents *rollupContents = getRollupContents(); - - if (rollupContents->hasExpandableWidgets()) { - setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Expanding); - } else { - setSizePolicy(sizePolicy().horizontalPolicy(), QSizePolicy::Fixed); - } - - int h = rollupContents->height() + getAdditionalHeight(); - resize(width(), h); - - rollupContents->saveState(m_rollupState); + getRollupContents()->saveState(m_rollupState); applySettings(); } @@ -891,6 +880,8 @@ void MapGUI::applyMap3DSettings(bool reloadMap) m_webServer->addSubstitution("/map/map/map3d.html", "$CESIUM_ION_API_KEY$", cesiumIonAPIKey()); //ui->web->page()->profile()->clearHttpCache(); ui->web->load(QUrl(QString("http://127.0.0.1:%1/map/map/map3d.html").arg(m_webPort))); + //ui->web->load(QUrl(QString("http://webglreport.com/"))); + //ui->web->load(QUrl(QString("https://sandcastle.cesium.com/"))); //ui->web->load(QUrl("chrome://gpu/")); ui->web->show(); }