philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.6'

Browse Source
This commit is contained in:
Allen Winter
2022-07-11 08:36:52 -04:00
parent 2f9f2c9ba6 518724132b
commit 35c9ccdd6a
11 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/examples-qt6/MyMainWindow.py
View File

@@ -11,8 +11,8 @@
# pylint: disable=missing-module-docstring,missing-function-docstring,missing-class-docstring
# pylint: disable=no-name-in-module
from PyKDDockWidgetsQt6 import KDDockWidgets
from PySide6 import QtCore, QtWidgets, QtGui
from MyWidget1 import MyWidget1

1
python/examples-qt6/MyWidget1.py
View File

@@ -15,6 +15,7 @@ from PySide6 import QtGui
from MyWidget import MyWidget
# pylint: disable=too-few-public-methods
class MyWidget1(MyWidget):
def __init__(self, parent=None):
super().__init__(":/assets/triangles.png", ":/assets/KDAB_bubble_white.png", parent)

1
python/examples-qt6/MyWidget2.py
View File

@@ -15,6 +15,7 @@ from PySide6 import QtGui, QtCore
from MyWidget import MyWidget
# pylint: disable=too-few-public-methods
class MyWidget2(MyWidget):
def __init__(self, parent=None):

1
python/examples-qt6/MyWidget3.py
View File

@@ -15,6 +15,7 @@ from PySide6 import QtGui, QtCore
from MyWidget import MyWidget
# pylint: disable=too-few-public-methods
class MyWidget3(MyWidget):
def __init__(self, parent=None):

2
python/examples/MyMainWindow.py
View File

@@ -11,8 +11,8 @@
# pylint: disable=missing-module-docstring,missing-function-docstring,missing-class-docstring
# pylint: disable=no-name-in-module
from PyKDDockWidgets import KDDockWidgets
from PySide2 import QtCore, QtWidgets, QtGui
from MyWidget1 import MyWidget1

1
python/examples/MyWidget1.py
View File

@@ -15,6 +15,7 @@ from PySide2 import QtGui
from MyWidget import MyWidget
# pylint: disable=too-few-public-methods
class MyWidget1(MyWidget):
def __init__(self, parent=None):
super().__init__(":/assets/triangles.png", ":/assets/KDAB_bubble_white.png", parent)

1
python/examples/MyWidget2.py
View File

@@ -15,6 +15,7 @@ from PySide2 import QtGui, QtCore
from MyWidget import MyWidget
# pylint: disable=too-few-public-methods
class MyWidget2(MyWidget):
def __init__(self, parent=None):

1
python/examples/MyWidget3.py
View File

@@ -15,6 +15,7 @@ from PySide2 import QtGui, QtCore
from MyWidget import MyWidget
# pylint: disable=too-few-public-methods
class MyWidget3(MyWidget):
def __init__(self, parent=None):

2
src/MainWindow.cpp
View File

@@ -153,7 +153,7 @@ QMargins MainWindow::centerWidgetMargins() const
return d->m_centerWidgetMargins;
}
void MainWindow::setCenterWidgetMargins(const QMargins &margins)
void MainWindow::setCenterWidgetMargins(QMargins margins)
{
if (d->m_centerWidgetMargins == margins)
return;

2
src/MainWindow.h
View File

@@ -58,7 +58,7 @@ public:
QMargins centerWidgetMargins() const override;
//@brief sets the margins for the contents widgets
void setCenterWidgetMargins(const QMargins &margins);
void setCenterWidgetMargins(QMargins);
///@brief returns the internal layout
/// this is rarely needed unless you want to layout other widgets next to the

5
src/private/widgets/FloatingWindowWidget.cpp
View File

@@ -86,7 +86,7 @@ bool FloatingWindowWidget::event(QEvent *ev)
return FloatingWindow::event(ev);
}
bool FloatingWindowWidget::eventFilter(QObject *, QEvent *ev)
bool FloatingWindowWidget::eventFilter(QObject *o, QEvent *ev)
{
if (ev->type() == QEvent::WindowStateChange) {
@@ -102,10 +102,9 @@ bool FloatingWindowWidget::eventFilter(QObject *, QEvent *ev)
}
}
return false;
return FloatingWindow::eventFilter(o, ev);
}
void FloatingWindowWidget::init()
{
m_vlayout->setSpacing(0);