From 184b161d45b53432ea982be3fe72fbfbb52a4ee1 Mon Sep 17 00:00:00 2001 From: m_thread Date: Sun, 9 Feb 2014 17:39:16 +0100 Subject: [PATCH] OP-1191 Fixed weirdness showing in 'Edit Gadgets Mode' after switch to Fusion style. --- .../coreplugin/uavgadgetmanager/uavgadgetview.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp b/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp index 86ec14f21..96def978a 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetview.cpp @@ -104,7 +104,7 @@ UAVGadgetView::UAVGadgetView(Core::UAVGadgetManager *uavGadgetManager, IUAVGadge ++index; } - m_defaultToolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + m_defaultToolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); m_activeToolBar = m_defaultToolBar; QHBoxLayout *toolBarLayout = new QHBoxLayout(m_toolBar); @@ -115,7 +115,7 @@ UAVGadgetView::UAVGadgetView(Core::UAVGadgetManager *uavGadgetManager, IUAVGadge m_toolBar->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); QWidget *spacerWidget = new QWidget(this); - spacerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + spacerWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); m_activeLabel->setTextFormat(Qt::RichText); m_activeLabel->setText("" + tr("Active") + ""); @@ -124,9 +124,10 @@ UAVGadgetView::UAVGadgetView(Core::UAVGadgetManager *uavGadgetManager, IUAVGadge m_closeButton->setIcon(QIcon(":/core/images/closebutton.png")); m_top = new Utils::StyledBar(this); + m_top->setMaximumHeight(35); QHBoxLayout *toplayout = new QHBoxLayout(m_top); - toplayout->setSpacing(0); - toplayout->setMargin(0); + toplayout->setSpacing(4); + toplayout->setMargin(4); toplayout->addWidget(m_uavGadgetList); toplayout->addWidget(m_toolBar); // Custom toolbar stretches toplayout->addWidget(spacerWidget);