OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2657 Final cleanup and refactoring of legends size system

Browse Source
This commit is contained in:
Jacob Støren
2018-04-20 16:55:51 +02:00
parent 03ec76c20a
commit 3957027b4b
10 changed files with 49 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@@ -602,11 +602,11 @@ void RiuViewer::addColorLegendToBottomLeftCorner(caf::TitledOverlayFrame* legend
if (catLegend->categoryCount() > categoryThreshold)
{
catLegend->setSizeHint(cvf::Vec2ui(categoryWidth, height - 2 * border - axisCrossHeight - 2 * edgeAxisBorderHeight));
catLegend->setRenderSize(cvf::Vec2ui(categoryWidth, height - 3 * border - axisCrossHeight - 2 * edgeAxisBorderHeight));
}
else
{
catLegend->setSizeHint(cvf::Vec2ui(200, 200));
catLegend->setRenderSize(cvf::Vec2ui(categoryWidth, 200));
}
xPos += categoryWidth + border;
}
@@ -615,20 +615,21 @@ void RiuViewer::addColorLegendToBottomLeftCorner(caf::TitledOverlayFrame* legend
{
item->setLayoutFixedPosition(cvf::Vec2i(xPos, yPos));
yPos += item->sizeHint().y() + border + edgeAxisBorderHeight;
yPos += item->renderSize().y() + border + edgeAxisBorderHeight;
}
}
unsigned int requiredLegendWidth = 0u;
for (auto legend : overlayItems)
{
legend->computeLayoutAndExtents(legend->sizeHint());
requiredLegendWidth = std::max(requiredLegendWidth, legend->minimumWidth());
requiredLegendWidth = std::max(requiredLegendWidth, legend->preferredSize().x());
}
for (auto legend : overlayItems)
{
legend->setMatchedWidth(requiredLegendWidth);
cvf::Vec2ui widthAdjustedSize = legend->renderSize();
widthAdjustedSize.x() = requiredLegendWidth;
legend->setRenderSize(widthAdjustedSize);
}
}
@@ -890,7 +891,7 @@ cvf::OverlayItem* RiuViewer::pickFixedPositionedLegend(int winPosX, int winPosY)
for (auto overlayItem : m_visibleLegends)
{
if (overlayItem->layoutScheme() == cvf::OverlayItem::FIXED_POSITION &&
overlayItem->pick(translatedMousePosX, translatedMousePosY, overlayItem->fixedPosition(), overlayItem->sizeHint()))
overlayItem->pick(translatedMousePosX, translatedMousePosY, overlayItem->fixedPosition(), overlayItem->renderSize()))
{
return overlayItem.p();
}