diff options
| -rw-r--r-- | vcl/inc/qt5/QtFrame.hxx | 1 | ||||
| -rw-r--r-- | vcl/qt5/QtFrame.cxx | 20 |
2 files changed, 10 insertions, 11 deletions
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx index a54af3547c52..be0b0ee36757 100644 --- a/vcl/inc/qt5/QtFrame.hxx +++ b/vcl/inc/qt5/QtFrame.hxx @@ -132,6 +132,7 @@ class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public SalFrame bool isWindow() const; QWindow* windowHandle() const; QScreen* screen() const; + sal_Int32 screenNumber() const; bool isMinimized() const; bool isMaximized() const; void SetWindowStateImpl(Qt::WindowStates eState); diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx index 218af25130e0..1c2e81938ecb 100644 --- a/vcl/qt5/QtFrame.cxx +++ b/vcl/qt5/QtFrame.cxx @@ -74,15 +74,6 @@ static void SvpDamageHandler(void* handle, sal_Int32 nExtentsX, sal_Int32 nExten pThis->Damage(nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight); } -namespace -{ -sal_Int32 screenNumber(QScreen* pScreen) -{ - const QList<QScreen*> screens = QApplication::screens(); - return screens.indexOf(pScreen); -} -} - QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) : m_pTopLevel(nullptr) , m_bUseCairo(bUseCairo) @@ -292,6 +283,13 @@ QWindow* QtFrame::windowHandle() const QScreen* QtFrame::screen() const { return asChild()->screen(); } +sal_Int32 QtFrame::screenNumber() const +{ + QScreen* pScreen = screen(); + const QList<QScreen*> screens = QApplication::screens(); + return screens.indexOf(pScreen); +} + bool QtFrame::GetUseDarkMode() const { #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) @@ -1308,7 +1306,7 @@ void QtFrame::SetScreenNumber(unsigned int nScreen) screenGeo = pScreen->availableVirtualGeometry(); pWindow->setScreen(pScreen); pWindow->setGeometry(screenGeo); - nScreen = screenNumber(pScreen); + nScreen = screenNumber(); } // setScreen by itself has no effect, explicitly move the widget to @@ -1320,7 +1318,7 @@ void QtFrame::SetScreenNumber(unsigned int nScreen) // index outta bounds, use primary screen QScreen* primaryScreen = QApplication::primaryScreen(); pWindow->setScreen(primaryScreen); - nScreen = static_cast<sal_uInt32>(screenNumber(primaryScreen)); + nScreen = static_cast<sal_uInt32>(screenNumber()); } maGeometry.setScreen(nScreen); |