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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/UserInterface/RiuDraggableOverlayFrame.cpp
View File

@@ -40,7 +40,7 @@ RiuDraggableOverlayFrame::RiuDraggableOverlayFrame( QWidget* parent, const int s
dropShadowEffect->setBlurRadius( 3.0 );
dropShadowEffect->setColor( QColor( 100, 100, 100, 100 ) );
setGraphicsEffect( dropShadowEffect );
this->setContentsMargins( 1, 1, 1, 1 );
setContentsMargins( 1, 1, 1, 1 );
m_layout = new QVBoxLayout( this );
m_layout->setContentsMargins( 0, 0, 0, 0 );
}
@@ -68,7 +68,7 @@ void RiuDraggableOverlayFrame::setContentFrame( RiuAbstractOverlayContentFrame*
m_contentFrame = contentFrame;
m_layout->addWidget( m_contentFrame );
this->adjustSize();
adjustSize();
}
//--------------------------------------------------------------------------------------------------
@@ -79,7 +79,7 @@ void RiuDraggableOverlayFrame::renderTo( QPainter* painter, const QRect& targetR
if ( m_contentFrame )
{
painter->save();
painter->fillRect( targetRect, this->palette().color( QWidget::backgroundRole() ) );
painter->fillRect( targetRect, palette().color( QWidget::backgroundRole() ) );
QRect contentRect = targetRect;
contentRect.adjust( -1, -1, -1, -1 );
m_contentFrame->renderTo( painter, contentRect );