#2657 Better initial position of Ensemble curve color legend. Use preferred size

This commit is contained in:
Jacob Støren 2018-04-20 16:58:00 +02:00
parent 3957027b4b
commit 72fc66f827
2 changed files with 9 additions and 2 deletions

View File

@ -33,7 +33,11 @@
RiuCvfOverlayItemWidget::RiuCvfOverlayItemWidget(QWidget* parent/*=0*/) RiuCvfOverlayItemWidget::RiuCvfOverlayItemWidget(QWidget* parent/*=0*/)
: QWidget(parent) : QWidget(parent)
{ {
this->setLayout(new QHBoxLayout(this)); auto hblayout = new QHBoxLayout(this);
hblayout->setMargin(0);
hblayout->setSpacing(0);
this->setLayout(hblayout);
m_overlayItemLabel = new QLabel(this); m_overlayItemLabel = new QLabel(this);
this->layout()->addWidget(m_overlayItemLabel); this->layout()->addWidget(m_overlayItemLabel);
} }

View File

@ -178,7 +178,7 @@ void RiuSummaryQwtPlot::addOrUpdateEnsembleCurveSetLegend(RimEnsembleCurveSet *
new RiuWidgetDragger(overlayWidget); new RiuWidgetDragger(overlayWidget);
m_ensembleLegendWidgets[curveSetToShowLegendFor] = overlayWidget; m_ensembleLegendWidgets[curveSetToShowLegendFor] = overlayWidget;
overlayWidget->move(30, 30); overlayWidget->move(65, 30);
} }
else else
{ {
@ -187,6 +187,9 @@ void RiuSummaryQwtPlot::addOrUpdateEnsembleCurveSetLegend(RimEnsembleCurveSet *
if ( overlayWidget ) if ( overlayWidget )
{ {
caf::TitledOverlayFrame* overlyItem = curveSetToShowLegendFor->legendConfig()->titledOverlayFrame();
overlyItem->setRenderSize(overlyItem->preferredSize());
overlayWidget->updateFromOverlyItem(curveSetToShowLegendFor->legendConfig()->titledOverlayFrame()); overlayWidget->updateFromOverlyItem(curveSetToShowLegendFor->legendConfig()->titledOverlayFrame());
overlayWidget->show(); overlayWidget->show();
} }