From a80e80dd940bdc855e0bd7a0b456af5e40c8a692 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Tue, 23 Jul 2013 21:59:02 +0200 Subject: [PATCH] added layout to table sub view --- apps/opencs/view/doc/subview.cpp | 5 ----- apps/opencs/view/world/tablesubview.cpp | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp index 731adabb3..153700d32 100644 --- a/apps/opencs/view/doc/subview.cpp +++ b/apps/opencs/view/doc/subview.cpp @@ -1,15 +1,10 @@ #include "subview.hpp" - CSVDoc::SubView::SubView (const CSMWorld::UniversalId& id) : mUniversalId (id) { /// \todo add a button to the title bar that clones this sub view setWindowTitle (mUniversalId.toString().c_str()); - - /// \todo remove (for testing only) - setMinimumWidth (100); - setMinimumHeight (60); } CSMWorld::UniversalId CSVDoc::SubView::getUniversalId() const diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp index 65cba4b02..502dcc292 100644 --- a/apps/opencs/view/world/tablesubview.cpp +++ b/apps/opencs/view/world/tablesubview.cpp @@ -1,6 +1,8 @@ #include "tablesubview.hpp" +#include + #include "../../model/doc/document.hpp" #include "table.hpp" @@ -9,7 +11,18 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D bool createAndDelete) : SubView (id) { - setWidget (mTable = new Table (id, document.getData(), document.getUndoStack(), createAndDelete)); + QVBoxLayout *layout = new QVBoxLayout; + + layout->setContentsMargins (QMargins (0, 0, 0, 0)); + + layout->addWidget ( + mTable = new Table (id, document.getData(), document.getUndoStack(), createAndDelete), 2); + + QWidget *widget = new QWidget; + + widget->setLayout (layout); + + setWidget (widget); connect (mTable, SIGNAL (editRequest (int)), this, SLOT (editRequest (int))); }