pool/qt6-declarative
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1158450 from home:fusionfuture:branches:KDE:Qt6

Browse Source 
- Add patch to help fix PointHandler with HiDPI (kde#482580)
  - 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch

OBS-URL: https://build.opensuse.org/request/show/1158450
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt6/qt6-declarative?expand=0&rev=63
This commit is contained in:
Christophe Marin 2024-03-16 11:15:24 +00:00 committed by Git OBS Bridge
parent 4095237710
commit b37019679f
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Fix-PointHandler-rejecting-click-events-near-window-.patch Normal file
View File

@ -0,0 +1,39 @@
From 9089292c495970b00728398f49e8f66bab1f4f32 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Sat, 16 Mar 2024 02:58:08 +0800
Subject: [PATCH] Fix PointHandler rejecting click events near window edge with
HiDPI
When using HiDPI and a click happens near the window edge, the global
position might have fractional parts, but after the global position is
converted to QPoint, the position can be rounded so it happens to stay
at the window edge, so the window geometry will not contain the rounded
position.
Related bugreport: https://bugs.kde.org/show_bug.cgi?id=482580
Pick-to: 6.6 6.7
Change-Id: I51a26f955fd58f2a135c64ceb32ee881a03fcaf8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
src/quick/handlers/qquickpointerhandler.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/quick/handlers/qquickpointerhandler.cpp b/src/quick/handlers/qquickpointerhandler.cpp
index c01cbd039fd..a29c8ae2d32 100644
--- a/src/quick/handlers/qquickpointerhandler.cpp
+++ b/src/quick/handlers/qquickpointerhandler.cpp
@@ -560,10 +560,10 @@ bool QQuickPointerHandler::parentContains(const QPointF &scenePosition) const
{
if (QQuickItem *par = parentItem()) {
if (par->window()) {
- QRect windowGeometry = par->window()->geometry();
+ QRectF windowGeometry = par->window()->geometry();
if (!par->window()->isTopLevel())
- windowGeometry = QRect(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size());
- QPoint screenPosition = par->window()->mapToGlobal(scenePosition.toPoint());
+ windowGeometry = QRectF(QWindowPrivate::get(par->window())->globalPosition(), par->window()->size());
+ QPointF screenPosition = par->window()->mapToGlobal(scenePosition);
if (!windowGeometry.contains(screenPosition))
return false;
}

6
qt6-declarative.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 16 10:20:52 UTC 2024 - Fusion Future <qydwhotmail@gmail.com>
- Add patch to help fix PointHandler with HiDPI (kde#482580)
- 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch
-------------------------------------------------------------------
Wed Feb 14 16:53:12 UTC 2024 - Christophe Marin <christophe@krop.fr>

2
qt6-declarative.spec
View File

@ -39,6 +39,8 @@ Patch0: 0001-qmlimportscanner-Include-module-versions-again.patch
# PATCH-FIX-UPSTREAM -- make build reproducible
Patch1: 0001-QuickControls-Link-the-impl-libraries-into-the-base-.patch
Patch2: 0001-Dialogs-Depend-on-controls-styles-in-QuickDialogs2Qu.patch
# PATCH-FIX-UPSTREAM kde#482580
Patch3: 0001-Fix-PointHandler-rejecting-click-events-near-window-.patch
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: qt6-core-private-devel