mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-25 07:31:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tanaxiusi/Qt-Advanced-Docking-System into tanaxiusi-master

Browse Source
This commit is contained in:
mfreiholz 2016-03-16 13:29:46 +01:00
commit 4ce04ecf2b
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AdvancedDockingSystem/src/ContainerWidget.cpp
View File

@ -489,6 +489,8 @@ bool ContainerWidget::restoreState(const QByteArray& data)
int cnt = 0; int cnt = 0;
in >> cnt; in >> cnt;
if(cnt > 0)
{
// Create dummy section, required to call hideSectionContent() later. // Create dummy section, required to call hideSectionContent() later.
SectionWidget* sw = new SectionWidget(this); SectionWidget* sw = new SectionWidget(this);
sections.append(sw); sections.append(sw);
@ -510,6 +512,7 @@ bool ContainerWidget::restoreState(const QByteArray& data)
contentsToHide.append(sc); contentsToHide.append(sc);
} }
} }
}
else if (mode == 1) else if (mode == 1)
{ {
success = restoreSectionWidgets(in, version, NULL, sections, contentsToHide); success = restoreSectionWidgets(in, version, NULL, sections, contentsToHide);

5
AdvancedDockingSystem/src/SectionTitleWidget.cpp
View File

@ -68,6 +68,7 @@ void SectionTitleWidget::setActiveTab(bool active)
void SectionTitleWidget::mousePressEvent(QMouseEvent* ev) void SectionTitleWidget::mousePressEvent(QMouseEvent* ev)
{ {
// qDebug() << Q_FUNC_INFO << ev->pos(); // qDebug() << Q_FUNC_INFO << ev->pos();
this->grabMouse();
if (ev->button() == Qt::LeftButton) if (ev->button() == Qt::LeftButton)
{ {
_dragStartPos = ev->pos(); _dragStartPos = ev->pos();
@ -80,6 +81,8 @@ void SectionTitleWidget::mousePressEvent(QMouseEvent* ev)
void SectionTitleWidget::mouseReleaseEvent(QMouseEvent* ev) void SectionTitleWidget::mouseReleaseEvent(QMouseEvent* ev)
{ {
// qDebug() << Q_FUNC_INFO << ev->pos(); // qDebug() << Q_FUNC_INFO << ev->pos();
if(QWidget::mouseGrabber() == this)
this->releaseMouse();
SectionWidget* section = NULL; SectionWidget* section = NULL;
// Drop contents of FloatingWidget into SectionWidget. // Drop contents of FloatingWidget into SectionWidget.
@ -189,7 +192,7 @@ void SectionTitleWidget::mouseMoveEvent(QMouseEvent* ev)
SectionWidget* section = NULL; SectionWidget* section = NULL;
// Move already existing FloatingWidget // Move already existing FloatingWidget
if (_fw) if (_fw && (ev->buttons() & Qt::LeftButton))
{ {
const QPoint moveToPos = ev->globalPos() - (_dragStartPos + QPoint(ADS_WINDOW_FRAME_BORDER_WIDTH, ADS_WINDOW_FRAME_BORDER_WIDTH)); const QPoint moveToPos = ev->globalPos() - (_dragStartPos + QPoint(ADS_WINDOW_FRAME_BORDER_WIDTH, ADS_WINDOW_FRAME_BORDER_WIDTH));
_fw->move(moveToPos); _fw->move(moveToPos);