mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-01-26 14:29:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes position mapping of sections inside container. all positions are now relative to it's container.

Browse Source
This commit is contained in:
mfreiholz 2016-04-06 07:52:17 +02:00
parent 0eea083f07
commit f2a352c305
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AdvancedDockingSystem/src/ContainerWidget.cpp
View File

@ -1,5 +1,6 @@
#include "ads/ContainerWidget.h" #include "ads/ContainerWidget.h"
#include <QDebug>
#include <QPaintEvent> #include <QPaintEvent>
#include <QPainter> #include <QPainter>
#include <QContextMenuEvent> #include <QContextMenuEvent>
@ -838,11 +839,11 @@ bool ContainerWidget::saveSectionIndex(ADS_NS_SER::SectionIndexData& sid) const
return false; return false;
sid.sectionsCount = _sections.count(); sid.sectionsCount = _sections.count();
for (int i = 0; i < _sections.count(); ++i) for (int i = 0; i < sid.sectionsCount; ++i)
{ {
ADS_NS_SER::SectionEntity se; ADS_NS_SER::SectionEntity se;
se.x = _sections[i]->mapTo(const_cast<ContainerWidget*>(this), _sections[i]->pos()).x(); se.x = mapFromGlobal(_sections[i]->parentWidget()->mapToGlobal(_sections[i]->pos())).x();
se.y = _sections[i]->mapTo(const_cast<ContainerWidget*>(this), _sections[i]->pos()).y(); se.y = mapFromGlobal(_sections[i]->parentWidget()->mapToGlobal(_sections[i]->pos())).y();
se.width = _sections[i]->geometry().width(); se.width = _sections[i]->geometry().width();
se.height = _sections[i]->geometry().height(); se.height = _sections[i]->geometry().height();
se.currentIndex = _sections[i]->currentIndex(); se.currentIndex = _sections[i]->currentIndex();
@ -856,6 +857,7 @@ bool ContainerWidget::saveSectionIndex(ADS_NS_SER::SectionIndexData& sid) const
se.sectionContents.append(sce); // std::move()? se.sectionContents.append(sce); // std::move()?
} }
sid.sections.append(se); // std::move()? sid.sections.append(se); // std::move()?
qDebug() << "Container section:" << se.x << se.y << se.width << se.height;
} }
return true; return true;
} }