SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@682 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-11 22:32:16 +00:00
parent ed7d72e594
commit 9b5227b3bb
2 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
qglengine/qglview_test/qglview_window.ui
View File

@@ -1105,41 +1105,7 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="MaterialsEditor" name="matEditor" native="true"/>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>973</width>
<height>719</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="MaterialsEditor" name="matEditor" native="true"/>
</item>
</layout>
</widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

2
qglengine/widgets/materials_editor.cpp
View File

@@ -30,6 +30,8 @@ MaterialsEditor::MaterialsEditor(QWidget * parent): QWidget(parent) {
ui = new Ui::MaterialsEditor(); ui = new Ui::MaterialsEditor();
ui->setupUi(this); ui->setupUi(this);
ui->widgetMaterial->setMaterial(0); ui->widgetMaterial->setMaterial(0);
ui->scrollArea->viewport()->setAutoFillBackground(false);
ui->scrollAreaWidgetContents->setAutoFillBackground(false);
view = 0; view = 0;
} }