Skip to content

Qscrollarea widgetresizeable #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9bc719e
Create qscrollarea.py
altendky Mar 27, 2021
54632e8
pytest-xvfb and an application instance
altendky Mar 28, 2021
19403d4
missing import
altendky Mar 28, 2021
d377e95
more deps
altendky Mar 28, 2021
f0123bc
no bugfix?
altendky Mar 28, 2021
85ea007
add widgetResizable argument to QScrollArea.__init__()
altendky Mar 28, 2021
2f7c540
add changelog entry for #148
altendky Mar 28, 2021
aa203ed
widgetResizable is keyword only
altendky Mar 28, 2021
73b49ec
Merge branch 'master' into altendky-patch-3
altendky Mar 28, 2021
6af75a4
actually match master
altendky Mar 28, 2021
c002ab0
Merge remote-tracking branch 'pyqt5-stubs/master' into qscrollarea-wi…
bluebird75 Jan 3, 2022
ede0c54
Also fixes QGroupBox() reported in #147
bluebird75 Jan 3, 2022
caaa5a3
Simpler way of doing gui-less application
bluebird75 Jan 3, 2022
3e562aa
Update ChangeLog
bluebird75 Jan 3, 2022
579f7f0
Update ci.yml
bluebird75 Jan 3, 2022
0bbca92
Update test_stubs.py
bluebird75 Jan 3, 2022
6722e72
Remove unneeded spaces
bluebird75 Jan 3, 2022
b688f92
Typo
bluebird75 Jan 3, 2022
8112e26
Merge remote-tracking branch 'pyqt5-stubs/master' into qscrollarea-wi…
bluebird75 Jan 22, 2022
6b7b00c
Merge remote-tracking branch 'bluebird75/qscrollarea-widgetresizeable…
bluebird75 Jan 22, 2022
a600c25
Update CHANGELOG.md
bluebird75 Mar 14, 2022
c577794
Pin down mypy version to avoid CI crashing
bluebird75 Mar 14, 2022
c39f6fa
Merge branch 'qscrollarea-widgetresizeable' of github.com:bluebird75/…
bluebird75 Mar 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
if: matrix.os.name == 'Linux'
run: |
sudo apt-get update --yes
sudo apt-get install --yes libgl1
# Required to stubtest QtMultimedia
sudo apt-get install --yes libpulse-mainloop-glib0
sudo apt-get install --yes libgl1 libgl1-mesa-dev xvfb x11-utils libdbus-1-3 libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
* [#183](https://github.com/python-qt-tools/PyQt5-stubs/pull/183) Add missing operations on QSize
* [#189](https://github.com/python-qt-tools/PyQt5-stubs/pull/189) Fix QListWidget, QTreeWidget and QTableWidget so that their respective items are now optional in many places when used as argument or return value
* [#165](https://github.com/python-qt-tools/PyQt5-stubs/pull/165) allow `None` as argument for `QLineEdit.setText()`
* [#148](https://github.com/python-qt-tools/PyQt5-stubs/pull/148) add `widgetResizable` parameter to `QScrollArea.__init__()` and `objectName` parameter to `QGroupBox.__init__()`.


## 5.15.2.0

Expand Down
6 changes: 3 additions & 3 deletions PyQt5-stubs/QtWidgets.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -6540,9 +6540,9 @@ class QGridLayout(QLayout):
class QGroupBox(QWidget):

@typing.overload
def __init__(self, parent: typing.Optional[QWidget] = ...) -> None: ...
def __init__(self, parent: typing.Optional[QWidget] = ..., *, objectName: str = ...) -> None: ...
@typing.overload
def __init__(self, title: str, parent: typing.Optional[QWidget] = ...) -> None: ...
def __init__(self, title: str, parent: typing.Optional[QWidget] = ..., *, objectName: str = ...) -> None: ...

def mouseReleaseEvent(self, event: QtGui.QMouseEvent) -> None: ...
def mouseMoveEvent(self, event: QtGui.QMouseEvent) -> None: ...
Expand Down Expand Up @@ -8431,7 +8431,7 @@ class QRubberBand(QWidget):

class QScrollArea(QAbstractScrollArea):

def __init__(self, parent: typing.Optional[QWidget] = ...) -> None: ...
def __init__(self, parent: typing.Optional[QWidget] = ..., *, widgetResizable: bool = ...) -> None: ...

def viewportSizeHint(self) -> QtCore.QSize: ...
def scrollContentsBy(self, dx: int, dy: int) -> None: ...
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def find_version(*file_paths):
packages=["PyQt5-stubs"],
extras_require={
"build": ["docker==4.2.0"],
"dev": ["mypy", "pytest", "pytest-xvfb"],
"dev": ["mypy==0.930", "pytest", "pytest-xvfb"],
},
classifiers=[
"Development Status :: 4 - Beta",
Expand Down
3 changes: 3 additions & 0 deletions tests/qgroupbox.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from PyQt5.QtWidgets import QGroupBox

groupBox = QGroupBox(objectName='some_name')
3 changes: 3 additions & 0 deletions tests/qscrollarea.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from PyQt5.QtWidgets import QScrollArea

scrollArea = QScrollArea(widgetResizable=True)
1 change: 0 additions & 1 deletion tests/simple.py

This file was deleted.