Commit ed70c9ad authored by Robin Eschbach's avatar Robin Eschbach
Browse files

[FIX #735] more merge problems

parent 8b3e582c
......@@ -51,10 +51,6 @@
#include "events/WEventTypes.h"
#include "events/WRenderedFrameEvent.h"
#ifdef OW_QT5_GLWIDGET
WQtGLWidget::WQtGLWidget( std::string nameOfViewer, QWidget* parent, WGECamera::ProjectionMode projectionMode, const QWidget* /* shareWidget */ ):
QOpenGLWidget( parent ),
#else
WQtGLWidget::WQtGLWidget( std::string nameOfViewer, QWidget* parent, WGECamera::ProjectionMode projectionMode, const QWidget* shareWidget ):
#ifdef OW_QT6_GLWIDGET
QOpenGLWidget( parent ),
......
......@@ -45,13 +45,13 @@ WPropertyTransferFunction2DWidget::WPropertyTransferFunction2DWidget( WPropTrans
{
setAttribute( Qt::WA_DeleteOnClose );
m_layout.addWidget( &m_transferFunction );
m_layout.setMargin( WGLOBAL_MARGIN );
m_layout.setContentsMargins( WGLOBAL_MARGIN, WGLOBAL_MARGIN, WGLOBAL_MARGIN, WGLOBAL_MARGIN );
m_layout.setSpacing( WGLOBAL_SPACING );
m_parameterWidgets.setLayout( &m_layout );
// Information Output ( Property Purpose = PV_PURPOSE_INFORMATION )
m_infoLayout.setMargin( WGLOBAL_MARGIN );
m_infoLayout.setContentsMargins( WGLOBAL_MARGIN, WGLOBAL_MARGIN, WGLOBAL_MARGIN, WGLOBAL_MARGIN );
m_infoLayout.setSpacing( WGLOBAL_SPACING );
m_informationWidgets.setLayout( &m_infoLayout );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment