[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qtatspi] src: Fix signature of getCharacterExtents
From:       Frederik Gladhorn <frederik.gladhorn () theqtcompany ! com>
Date:       2015-08-11 7:26:58
Message-ID: E1ZP3xa-0005jR-DY () scm ! kde ! org
[Download RAW message or body]

Git commit fd0d5867348f6450a61294d6f85965e963bf1d48 by Frederik Gladhorn.
Committed on 11/08/2015 at 07:26.
Pushed by gladhorn into branch 'master'.

Fix signature of getCharacterExtents

The function used to return {iiii} (QRect) but should return just iiii.
This is a backport from Qt 5.

See also QTBUG-47653

M  +3    -2    src/atspiadaptor.cpp

http://commits.kde.org/qtatspi/fd0d5867348f6450a61294d6f85965e963bf1d48

diff --git a/src/atspiadaptor.cpp b/src/atspiadaptor.cpp
index fdf5bfb..007cbd0 100644
--- a/src/atspiadaptor.cpp
+++ b/src/atspiadaptor.cpp
@@ -2090,12 +2090,13 @@ QVariantList AtSpiAdaptor::getAttributeValue(QAccessibleInterface \
*interface, in  return list;
 }
 
-QRect AtSpiAdaptor::getCharacterExtents(QAccessibleInterface *interface, int offset, uint \
coordType) const +QList<QVariant> AtSpiAdaptor::getCharacterExtents(QAccessibleInterface \
*interface, int offset, uint coordType) const  {
     QRect rect = interface->textInterface()->characterRect(offset, \
QAccessible2::RelativeToScreen);  if (coordType == ATSPI_COORD_TYPE_WINDOW)
         rect = translateRectToWindowCoordinates(interface, rect);
-    return rect;
+
+    return QList<QVariant>() << rect.x() << rect.y() << rect.width() << rect.height();
 }
 
 QRect AtSpiAdaptor::getRangeExtents(QAccessibleInterface *interface,


[prev in list] [next in list] [prev in thread] [next in thread]