kosslan/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/popupwindow: remove parentWindow deprecation message

Browse source 
Was being falsely triggered by lints.
This commit is contained in:
outfoxxed 2024-11-19 17:20:53 -08:00
parent eb5a5b8b67
commit dbaaf55eb6
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/debug/lint.cpp
View file

@ -7,10 +7,7 @@
#include <qqmlcontext.h> #include <qqmlcontext.h>
#include <qqmlengine.h> #include <qqmlengine.h>
#include <qqmlinfo.h> #include <qqmlinfo.h>
#include <qquickframebufferobject.h>
#include <qquickitem.h> #include <qquickitem.h>
#include <qquickpainteditem.h>
#include <qquickrhiitem.h>
#include <qquickwindow.h> #include <qquickwindow.h>
#include <qstringliteral.h> #include <qstringliteral.h>

1
src/wayland/popupanchor.cpp
View file

@ -6,6 +6,7 @@
#include <private/wayland-xdg-shell-client-protocol.h> #include <private/wayland-xdg-shell-client-protocol.h>
#include <qvariant.h> #include <qvariant.h>
#include <qwindow.h> #include <qwindow.h>
#include <qtmetamacros.h>
#include "../core/popupanchor.hpp" #include "../core/popupanchor.hpp"
#include "../core/types.hpp" #include "../core/types.hpp"

15
src/window/popupwindow.cpp
View file

@ -3,7 +3,7 @@
#include <qlogging.h> #include <qlogging.h>
#include <qnamespace.h> #include <qnamespace.h>
#include <qobject.h> #include <qobject.h>
#include <qquickwindow.h> #include <qqmlinfo.h>
#include <qtypes.h> #include <qtypes.h>
#include <qwindow.h> #include <qwindow.h>
@ -38,12 +38,11 @@ void ProxyPopupWindow::completeWindow() {
void ProxyPopupWindow::postCompleteWindow() { this->updateTransientParent(); } void ProxyPopupWindow::postCompleteWindow() { this->updateTransientParent(); }
void ProxyPopupWindow::setParentWindow(QObject* parent) { void ProxyPopupWindow::setParentWindow(QObject* parent) {
qWarning() << "PopupWindow.parentWindow is deprecated. Use PopupWindow.anchor.window."; qmlWarning(this) << "PopupWindow.parentWindow is deprecated. Use PopupWindow.anchor.window.";
this->mAnchor.setWindow(parent); this->mAnchor.setWindow(parent);
} }
QObject* ProxyPopupWindow::parentWindow() const { QObject* ProxyPopupWindow::parentWindow() const {
qWarning() << "PopupWindow.parentWindow is deprecated. Use PopupWindow.anchor.window.";
return this->mAnchor.window(); return this->mAnchor.window();
} }
@ -71,7 +70,7 @@ void ProxyPopupWindow::updateTransientParent() {
void ProxyPopupWindow::onParentUpdated() { this->updateTransientParent(); } void ProxyPopupWindow::onParentUpdated() { this->updateTransientParent(); }
void ProxyPopupWindow::setScreen(QuickshellScreenInfo* /*unused*/) { void ProxyPopupWindow::setScreen(QuickshellScreenInfo* /*unused*/) {
qWarning() << "Cannot set screen of popup window, as that is controlled by the parent window"; qmlWarning(this) << "Cannot set screen of popup window, as that is controlled by the parent window";
} }
void ProxyPopupWindow::setVisible(bool visible) { void ProxyPopupWindow::setVisible(bool visible) {
@ -101,7 +100,7 @@ void ProxyPopupWindow::onVisibleChanged() {
} }
void ProxyPopupWindow::setRelativeX(qint32 x) { void ProxyPopupWindow::setRelativeX(qint32 x) {
qWarning() << "PopupWindow.relativeX is deprecated. Use PopupWindow.anchor.rect.x."; qmlWarning(this) << "PopupWindow.relativeX is deprecated. Use PopupWindow.anchor.rect.x.";
auto rect = this->mAnchor.rect(); auto rect = this->mAnchor.rect();
if (x == rect.x) return; if (x == rect.x) return;
rect.x = x; rect.x = x;
@ -109,12 +108,12 @@ void ProxyPopupWindow::setRelativeX(qint32 x) {
} }
qint32 ProxyPopupWindow::relativeX() const { qint32 ProxyPopupWindow::relativeX() const {
qWarning() << "PopupWindow.relativeX is deprecated. Use PopupWindow.anchor.rect.x."; qmlWarning(this) << "PopupWindow.relativeX is deprecated. Use PopupWindow.anchor.rect.x.";
return this->mAnchor.rect().x; return this->mAnchor.rect().x;
} }
void ProxyPopupWindow::setRelativeY(qint32 y) { void ProxyPopupWindow::setRelativeY(qint32 y) {
qWarning() << "PopupWindow.relativeY is deprecated. Use PopupWindow.anchor.rect.y."; qmlWarning(this) << "PopupWindow.relativeY is deprecated. Use PopupWindow.anchor.rect.y.";
auto rect = this->mAnchor.rect(); auto rect = this->mAnchor.rect();
if (y == rect.y) return; if (y == rect.y) return;
rect.y = y; rect.y = y;
@ -122,7 +121,7 @@ void ProxyPopupWindow::setRelativeY(qint32 y) {
} }
qint32 ProxyPopupWindow::relativeY() const { qint32 ProxyPopupWindow::relativeY() const {
qWarning() << "PopupWindow.relativeY is deprecated. Use PopupWindow.anchor.rect.y."; qmlWarning(this) << "PopupWindow.relativeY is deprecated. Use PopupWindow.anchor.rect.y.";
return this->mAnchor.rect().y; return this->mAnchor.rect().y;
} }

6
src/window/popupwindow.hpp
View file

@ -30,9 +30,9 @@
/// } /// }
/// ///
/// PopupWindow { /// PopupWindow {
/// parentWindow: toplevel /// anchor.window: toplevel
/// relativeX: parentWindow.width / 2 - width / 2 /// anchor.rect.x: parentWindow.width / 2 - width / 2
/// relativeY: parentWindow.height /// anchor.rect.y: parentWindow.height
/// width: 500 /// width: 500
/// height: 500 /// height: 500
/// visible: true /// visible: true