summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2012-11-15 17:06:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-23 00:47:48 +0100
commit1dff3d1d83606dd8bc02425c74909f3d978588b7 (patch)
tree0f15aed5d1a0d676c71bc8801244c6766f854939 /src
parentb77749e9973da2199029f1271e55d8b42c0e7d2e (diff)
Accessibility: set multiline state for text edits.
Change-Id: I22d3baac8fc57db0c89d8543019a93263b2023ca Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.cpp11
-rw-r--r--src/plugins/accessible/widgets/qaccessiblewidgets.h2
2 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index 9d0d3f0145..56e6166e85 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -134,7 +134,7 @@ void QAccessiblePlainTextEdit::setText(QAccessible::Text t, const QString &text)
QAccessible::State QAccessiblePlainTextEdit::state() const
{
- QAccessible::State st = QAccessibleWidget::state();
+ QAccessible::State st = QAccessibleTextWidget::state();
if (plainTextEdit()->isReadOnly())
st.readOnly = true;
else
@@ -258,7 +258,7 @@ void QAccessibleTextEdit::setText(QAccessible::Text t, const QString &text)
QAccessible::State QAccessibleTextEdit::state() const
{
- QAccessible::State st = QAccessibleWidget::state();
+ QAccessible::State st = QAccessibleTextWidget::state();
if (textEdit()->isReadOnly())
st.readOnly = true;
else
@@ -806,6 +806,13 @@ QAccessibleTextWidget::QAccessibleTextWidget(QWidget *o, QAccessible::Role r, co
}
+QAccessible::State QAccessibleTextWidget::state() const
+{
+ QAccessible::State s = QAccessibleWidget::state();
+ s.multiLine = true;
+ return s;
+}
+
QRect QAccessibleTextWidget::characterRect(int offset) const
{
QTextBlock block = textDocument()->findBlock(offset);
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h
index d93cd6cd78..e14b89a63b 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.h
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h
@@ -76,6 +76,8 @@ class QAccessibleTextWidget : public QAccessibleWidget,
public:
QAccessibleTextWidget(QWidget *o, QAccessible::Role r = QAccessible::EditableText, const QString &name = QString());
+ QAccessible::State state() const;
+
// QAccessibleTextInterface
// selection
void selection(int selectionIndex, int *startOffset, int *endOffset) const;