diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-08-14 12:47:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-28 00:50:09 +0200 |
| commit | b626b98b9552b459919f90496e60931e9f2071f1 (patch) | |
| tree | f9bc6baafd658539b2355b9325cd412d5d2f2f62 /src/plugins/accessible | |
| parent | 47459d33500b757386573cf802c4aac9a6be8e7e (diff) | |
Implement QAccessibleLineEdit::characterRect()
It was probably not implemented because it needed to access
private APIs.
However, accessing those from this a11y plugin is unproblematic.
Forward-ported from Qt 4.8 with change
d2fb64d52fc6ec229d775f829a9a0cb3d251aad3 (and then slightly improved)
Change-Id: Ifa2d48c152fd75fc1fff49a05369787a7db3b902
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/plugins/accessible')
| -rw-r--r-- | src/plugins/accessible/widgets/simplewidgets.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index bb90061a7e..9bdb1decde 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -53,6 +53,7 @@ #include <qgroupbox.h> #include <qlcdnumber.h> #include <qlineedit.h> +#include <private/qlineedit_p.h> #include <qstyle.h> #include <qstyleoption.h> #include <qtextdocument.h> @@ -672,10 +673,20 @@ int QAccessibleLineEdit::cursorPosition() const return lineEdit()->cursorPosition(); } -QRect QAccessibleLineEdit::characterRect(int /*offset*/) const +QRect QAccessibleLineEdit::characterRect(int offset) const { - // QLineEdit doesn't hand out character rects - return QRect(); + int x = lineEdit()->d_func()->control->cursorToX(offset); + int y; + lineEdit()->getTextMargins(0, &y, 0, 0); + QFontMetrics fm(lineEdit()->font()); + const QString ch = text(offset, offset + 1); + if (ch.isEmpty()) + return QRect(); + int w = fm.width(ch); + int h = fm.height(); + QRect r(x, y, w, h); + r.moveTo(lineEdit()->mapToGlobal(r.topLeft())); + return r; } int QAccessibleLineEdit::selectionCount() const |