ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Qt use asChild for pointer positioning

Browse Source 
.. and refactor some variable names.

Change-Id: I7d31a7a377f614bdd78f8d09852a2eda0cc47442
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127153
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2021-12-21 00:49:44 +01:00
parent b8a801def4
commit e63fe68fb1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/qt5/QtFrame.cxx
+5 -6
View File
@@ -512,11 +512,10 @@ void QtFrame::SetDefaultPos()
if (m_pParent)
{
const qreal fRatio = devicePixelRatioF();
QWidget* const pWindow = m_pParent->GetQWidget()->window();
QWidget* const pWidget = asChild();
QPoint aPos = pWindow->rect().center() - pWidget->rect().center();
SetPosSize(round(aPos.x() * fRatio), round(aPos.y() * fRatio), 0, 0,
SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y);
QWidget* const pParentWin = m_pParent->asChild()->window();
QWidget* const pChildWin = asChild()->window();
QPoint aPos = (pParentWin->rect().center() - pChildWin->rect().center()) * fRatio;
SetPosSize(aPos.x(), aPos.y(), 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y);
assert(!m_bDefaultPos);
}
else
@@ -863,7 +862,7 @@ void QtFrame::SetPointerPos(tools::Long nX, tools::Long nY)
{
// some cursor already exists (and it has m_ePointerStyle shape)
// so here we just reposition it
QCursor::setPos(m_pQWidget->mapToGlobal(QPoint(nX, nY)));
QCursor::setPos(asChild()->mapToGlobal(QPoint(nX, nY)));
}
void QtFrame::Flush()
vcl/qt5/QtWidget.cxx
+1
View File
@@ -257,6 +257,7 @@ void QtWidget::dropEvent(QDropEvent* pEvent) { m_rFrame.handleDrop(pEvent); }
void QtWidget::moveEvent(QMoveEvent* pEvent)
{
// already handled by QtMainWindow::moveEvent
if (m_rFrame.m_pTopLevel)
return;