vcl/qt5/Qt5Widget.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 61bf6b4d90aa1d37009b397e44fe39c9c5b06afd
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Feb 15 17:46:37 2021 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 16 07:38:10 2021 +0100
tdf#140207 Qt downscale the ExtTextInputPos
Qt reports the unscaled pixel values to the IM, so simply divide
all values reported by SalEvent::ExtTextInputPos by the window's
scale factor. This correctly positions the IM window on a scaled
LO window.
Change-Id: Ia639ee3e5fc0e47f7017896b34730bbda7f06a16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110945
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
(cherry picked from commit 41cffc379259fec626a282ca243a9750d96d1c63)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110915
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 40500585e1fe..93c577ce87c2 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -681,10 +681,11 @@ QVariant Qt5Widget::inputMethodQuery(Qt::InputMethodQuery
property) const
}
case Qt::ImCursorRectangle:
{
+ const qreal fRatio = m_rFrame.devicePixelRatioF();
SalExtTextInputPosEvent aPosEvent;
m_rFrame.CallCallback(SalEvent::ExtTextInputPos, &aPosEvent);
- return QVariant(
- QRect(aPosEvent.mnX, aPosEvent.mnY, aPosEvent.mnWidth,
aPosEvent.mnHeight));
+ return QVariant(QRect(aPosEvent.mnX / fRatio, aPosEvent.mnY /
fRatio,
+ aPosEvent.mnWidth / fRatio,
aPosEvent.mnHeight / fRatio));
}
case Qt::ImAnchorPosition:
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
