From 085f26a7190295fb01547ef901dd19cc85cd8463 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 9 Jul 2023 11:04:30 -0400 Subject: [PATCH] Improve content margins on various layouts, set sensible size for window --- mdlviewer/src/boneeditor.cpp | 7 +++++-- mdlviewer/src/fullmodelviewer.cpp | 5 +++-- mdlviewer/src/gearlistwidget.cpp | 1 + mdlviewer/src/singlegearview.cpp | 1 + parts/mdl/mdlpart.cpp | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mdlviewer/src/boneeditor.cpp b/mdlviewer/src/boneeditor.cpp index 0386374..a380f80 100644 --- a/mdlviewer/src/boneeditor.cpp +++ b/mdlviewer/src/boneeditor.cpp @@ -46,8 +46,11 @@ BoneEditor::BoneEditor(GearView* gearView, QWidget* parent) : gearView(gearView) layout->addWidget(boneListWidget); + auto transformLayout = new QVBoxLayout(); + layout->addLayout(transformLayout); + auto transformGroup = new QGroupBox("Bone Transform"); - layout->addWidget(transformGroup); + transformLayout->addWidget(transformGroup); auto transformGroupLayout = new QFormLayout(); transformGroup->setLayout(transformGroupLayout); @@ -75,7 +78,7 @@ BoneEditor::BoneEditor(GearView* gearView, QWidget* parent) : gearView(gearView) connect(boneListWidget, &QTreeWidget::itemClicked, this, &BoneEditor::treeItemClicked); auto raceDeformGroup = new QGroupBox("Race Deform"); - layout->addWidget(raceDeformGroup); + transformLayout->addWidget(raceDeformGroup); auto raceDeformGroupLayout = new QFormLayout(); raceDeformGroup->setLayout(raceDeformGroupLayout); diff --git a/mdlviewer/src/fullmodelviewer.cpp b/mdlviewer/src/fullmodelviewer.cpp index 9885f84..1e49c4b 100644 --- a/mdlviewer/src/fullmodelviewer.cpp +++ b/mdlviewer/src/fullmodelviewer.cpp @@ -11,8 +11,8 @@ FullModelViewer::FullModelViewer(GameData* data, FileCache& cache) : data(data) { setWindowTitle("Full Model Viewer"); - setMinimumWidth(640); - setMinimumHeight(480); + setMinimumWidth(1280); + setMinimumHeight(720); auto layout = new QVBoxLayout(); setLayout(layout); @@ -50,6 +50,7 @@ FullModelViewer::FullModelViewer(GameData* data, FileCache& cache) : data(data) connect(gearView, &GearView::modelReloaded, this, &FullModelViewer::updateCharacterParameters); auto viewportLayout = new QHBoxLayout(); + viewportLayout->setContentsMargins(0, 0, 0, 0); viewportLayout->addWidget(gearView, 1); layout->addLayout(viewportLayout); diff --git a/mdlviewer/src/gearlistwidget.cpp b/mdlviewer/src/gearlistwidget.cpp index 51faf9f..917f605 100644 --- a/mdlviewer/src/gearlistwidget.cpp +++ b/mdlviewer/src/gearlistwidget.cpp @@ -9,6 +9,7 @@ GearListWidget::GearListWidget(GameData* data, QWidget* parent) : data(data) { auto layout = new QVBoxLayout(); + layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); auto searchModel = new QSortFilterProxyModel(); diff --git a/mdlviewer/src/singlegearview.cpp b/mdlviewer/src/singlegearview.cpp index 387e594..6459d1b 100644 --- a/mdlviewer/src/singlegearview.cpp +++ b/mdlviewer/src/singlegearview.cpp @@ -11,6 +11,7 @@ SingleGearView::SingleGearView(GameData* data, FileCache& cache) : data(data) { gearView = new GearView(data, cache); auto layout = new QVBoxLayout(); + layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(gearView); setLayout(layout); diff --git a/parts/mdl/mdlpart.cpp b/parts/mdl/mdlpart.cpp index 84cc7fb..547b33e 100644 --- a/parts/mdl/mdlpart.cpp +++ b/parts/mdl/mdlpart.cpp @@ -145,6 +145,7 @@ private: MDLPart::MDLPart(GameData* data, FileCache& cache) : data(data), cache(cache) { auto viewportLayout = new QVBoxLayout(); + viewportLayout->setContentsMargins(0, 0, 0, 0); setLayout(viewportLayout); renderer = new Renderer();