Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issues splitting views.

Browse source
This commit is contained in:
Leonardo Zide 2017-03-26 10:28:58 -07:00
parent 57b8732ed6
commit 7bd3abf6b4
3 changed files with 57 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
common/lc_mainwindow.cpp
View file

@ -21,6 +21,24 @@
lcMainWindow* gMainWindow;
void lcModelTabWidget::ResetLayout()
{
QLayout* TabLayout = layout();
QWidget* TopWidget = TabLayout->itemAt(0)->widget();
if (TopWidget->metaObject() == &lcQGLWidget::staticMetaObject)
return;
QWidget* Widget = GetAnyViewWidget();
TabLayout->addWidget(Widget);
TabLayout->removeWidget(TopWidget);
TopWidget->deleteLater();
Widget->setFocus();
SetActiveView((View*)((lcQGLWidget*)Widget)->widget);
}
lcMainWindow::lcMainWindow()
{
memset(mActions, 0, sizeof(mActions));
@ -1332,6 +1350,7 @@ void lcMainWindow::SplitView(Qt::Orientation Orientation)
Sizes.append(10);
Sizes.append(10);
Splitter->setSizes(Sizes);
Focus->setFocus();
}
void lcMainWindow::SplitHorizontal()
@ -1359,46 +1378,49 @@ void lcMainWindow::RemoveActiveView()
QWidget* ParentParentWidget = Parent->parentWidget();
QSplitter* ParentSplitter = (QSplitter*)Parent;
int FocusIndex = ParentSplitter->indexOf(Focus);
QWidget* OtherWidget = ParentSplitter->widget(!FocusIndex);
if (ParentParentWidget->metaObject() == &lcModelTabWidget::staticMetaObject)
{
QLayout* CentralLayout = ParentParentWidget->layout();
CentralLayout->addWidget(ParentSplitter->widget(!FocusIndex));
CentralLayout->addWidget(OtherWidget);
CentralLayout->removeWidget(Parent);
}
else
{
QSplitter* ParentParentSplitter = (QSplitter*)ParentParentWidget;
QList<int> Sizes = ParentParentSplitter->sizes();
return;
int ParentIndex = ParentParentSplitter->indexOf(Parent);
ParentParentSplitter->insertWidget(ParentIndex, OtherWidget);
ParentParentSplitter->setSizes(Sizes);
}
QSplitter* ParentParentSplitter = (QSplitter*)ParentParentWidget;
QList<int> Sizes = ParentParentSplitter->sizes();
Parent->deleteLater();
int ParentIndex = ParentParentSplitter->indexOf(Parent);
ParentParentSplitter->insertWidget(!ParentIndex, Focus);
if (OtherWidget->metaObject() != &lcQGLWidget::staticMetaObject)
{
lcModelTabWidget* TabWidget = (lcModelTabWidget*)mModelTabWidget->currentWidget();
delete Parent;
if (TabWidget)
OtherWidget = TabWidget->GetAnyViewWidget();
}
ParentParentSplitter->setSizes(Sizes);
OtherWidget->setFocus();
SetActiveView((View*)((lcQGLWidget*)OtherWidget)->widget);
}
void lcMainWindow::ResetViews()
{
QWidget* TabWidget = mModelTabWidget->currentWidget();
lcModelTabWidget* TabWidget = (lcModelTabWidget*)mModelTabWidget->currentWidget();
if (!TabWidget)
return;
QLayout* TabLayout = TabWidget->layout();
QWidget* TopWidget = TabLayout->itemAt(0)->widget();
TabLayout->removeWidget(TopWidget);
TopWidget->deleteLater();
View* NewView = new View(lcGetActiveModel());
QWidget* ViewWidget = new lcQGLWidget(TabWidget, NewView, true);
TabLayout->addWidget(ViewWidget);
ViewWidget->show();
ViewWidget->setFocus();
NewView->ZoomExtents();
SetActiveView(NewView);
TabWidget->ResetLayout();
TabWidget->GetActiveView()->SetViewpoint(LC_VIEWPOINT_HOME);
}
void lcMainWindow::TogglePrintPreview()

12
common/lc_mainwindow.h
View file

@ -41,6 +41,18 @@ public:
mActiveView = NULL;
}
void ResetLayout();
QWidget* GetAnyViewWidget()
{
QWidget* Widget = layout()->itemAt(0)->widget();
while (Widget->metaObject() == &QSplitter::staticMetaObject)
Widget = ((QSplitter*)Widget)->widget(0);
return Widget;
}
View* GetActiveView() const
{
return mActiveView;

3
common/lc_model.cpp
View file

@ -144,7 +144,10 @@ void lcModelProperties::ParseLDrawLine(QTextStream& Stream)
}
if (Token == QLatin1String("NAME"))
{
mBackgroundImage = Stream.readLine().trimmed();
mBackgroundType = LC_BACKGROUND_IMAGE;
}
}
}
}