OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1236 Property Editor : Scroll bar for reduced screen area

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-20 14:32:12 +01:00
parent 4df861fc9c
commit 75f2a6cb9f
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -553,8 +553,6 @@ void RiuMainWindow::createDockPanels()
m_pdmUiPropertyView = new caf::PdmUiPropertyView(dockWidget);
dockWidget->setWidget(m_pdmUiPropertyView);
m_pdmUiPropertyView->layout()->setContentsMargins(5,0,0,0);
addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
}

33
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.cpp
View File

@ -41,6 +41,7 @@
#include "cafPdmUiDefaultObjectEditor.h"
#include <QHBoxLayout>
#include <QScrollArea>
namespace caf
@ -53,12 +54,20 @@ namespace caf
PdmUiPropertyView::PdmUiPropertyView(QWidget* parent, Qt::WindowFlags f)
: QWidget (parent, f)
{
m_layout = new QVBoxLayout(this);
m_layout->insertStretch(1, 1);
m_layout->setContentsMargins(0, 0, 0, 0);
m_layout->setSpacing(0);
QScrollArea* scrollArea = new QScrollArea(this);
scrollArea->setFrameStyle(QFrame::NoFrame);
scrollArea->setWidgetResizable(true);
setLayout(m_layout);
m_placeholder = new QWidget();
scrollArea->setWidget(m_placeholder);
m_placeHolderLayout = new QVBoxLayout();
m_placeHolderLayout->setContentsMargins(5,0,0,0);
m_placeholder->setLayout(m_placeHolderLayout);
QVBoxLayout* dummy = new QVBoxLayout(this);
dummy->setContentsMargins(0,0,0,0);
dummy->addWidget(scrollArea);
m_currentObjectView = NULL;
}
@ -123,12 +132,11 @@ void PdmUiPropertyView::showProperties( PdmObjectHandle* object)
// Remove Widget from layout
if (m_currentObjectView)
{
layout()->removeWidget(m_currentObjectView->widget());
this->m_placeHolderLayout->removeWidget(m_currentObjectView->widget());
delete m_currentObjectView;
m_currentObjectView = NULL;
}
//m_currentObjectView = PdmObjViewFactory::instance()->create(object->editorType(m_uiConfigName));
if (!m_currentObjectView)
{
PdmUiDefaultObjectEditor* defaultEditor = new PdmUiDefaultObjectEditor();
@ -136,12 +144,15 @@ void PdmUiPropertyView::showProperties( PdmObjectHandle* object)
}
// Create widget to handle this
QWidget * page = NULL;
page = m_currentObjectView->getOrCreateWidget(this);
QWidget* propertyWidget = NULL;
propertyWidget = m_currentObjectView->getOrCreateWidget(m_placeholder);
assert(propertyWidget);
assert(page);
this->m_placeHolderLayout->insertWidget(0, propertyWidget);
this->m_layout->insertWidget(0, page);
// Add stretch to make sure the property widget is not stretched
this->m_placeHolderLayout->insertStretch(-1, 1);
}
m_currentObjectView->setPdmObject(object);

4
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
View File

@ -36,6 +36,7 @@
#pragma once
#include <QString>
#include <QWidget>
@ -69,7 +70,8 @@ public:
private:
PdmUiObjectEditorHandle* m_currentObjectView;
QString m_uiConfigName;
QVBoxLayout* m_layout;
QVBoxLayout* m_placeHolderLayout;
QWidget* m_placeholder;
};