Fix clipping of QTextList decorators.
List decorators may be clipped if you set a large font size and/or small indent for a QTextList. This fix is to prevent clipping by moving list decorators and items to left (or to right in case of right to left layouts) so that the list decorator is always painted inside the layout. This commit fixes painting related issue, so auto test is not needed. The manual test program can be used for verification purposes. Task-number: QTBUG-5111 Change-Id: I7fdd92399445d33fe9eaf525a05fe5cd860b57c6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Leonard Lee
The Qt Project
parent
5d07a4d944
commit
ad443dfb1d
@ -1425,7 +1425,20 @@ void QTextDocumentLayoutPrivate::drawListItem(const QPointF &offset, QPainter *p
|
||||
qreal xoff = fontMetrics.width(QLatin1Char(' '));
|
||||
if (dir == Qt::LeftToRight)
|
||||
xoff = -xoff - size.width();
|
||||
r.translate( xoff, (fontMetrics.height() / 2 - size.height() / 2));
|
||||
r.translate( xoff, (fontMetrics.height() / 2) - (size.height() / 2));
|
||||
|
||||
// Prevent clipping the left side of the list decorator (on left to
|
||||
// right layouts) and clipping the right side of the list
|
||||
// decorator (on right to left layouts).
|
||||
if ((r.left() < 0) && (dir == Qt::LeftToRight)) {
|
||||
int horizontalOffset = -r.left();
|
||||
r.translate(horizontalOffset, 0);
|
||||
layout->setPosition(layout->position() + QPointF(horizontalOffset, 0));
|
||||
} else if ((r.right() > document->pageSize().width()) && (dir == Qt::RightToLeft)) {
|
||||
int horizontalOffset = r.right() - document->pageSize().width();
|
||||
r.translate(-horizontalOffset, 0);
|
||||
layout->setPosition(layout->position() - QPointF(horizontalOffset, 0));
|
||||
}
|
||||
|
||||
painter->save();
|
||||
|
||||
|
||||
@ -24,6 +24,7 @@ qpainfo \
|
||||
qscreen \
|
||||
qssloptions \
|
||||
qtabletevent \
|
||||
qtexteditlist \
|
||||
qtbug-8933 \
|
||||
qtouchevent \
|
||||
qwidget_zorder \
|
||||
|
||||
52
tests/manual/qtexteditlist/main.cpp
Normal file
52
tests/manual/qtexteditlist/main.cpp
Normal file
@ -0,0 +1,52 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "widget.h"
|
||||
#include <QApplication>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QApplication a(argc, argv);
|
||||
Widget w;
|
||||
w.show();
|
||||
|
||||
return a.exec();
|
||||
}
|
||||
8
tests/manual/qtexteditlist/qtexteditlist.pro
Normal file
8
tests/manual/qtexteditlist/qtexteditlist.pro
Normal file
@ -0,0 +1,8 @@
|
||||
#This project can be used to verify QTBUG-5111 case.
|
||||
QT += core gui
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
TARGET = qtexteditlist
|
||||
TEMPLATE = app
|
||||
SOURCES += main.cpp widget.cpp
|
||||
HEADERS += widget.h
|
||||
FORMS += widget.ui
|
||||
129
tests/manual/qtexteditlist/widget.cpp
Normal file
129
tests/manual/qtexteditlist/widget.cpp
Normal file
@ -0,0 +1,129 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "widget.h"
|
||||
#include "ui_widget.h"
|
||||
|
||||
Widget::Widget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::Widget)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
// Changing font size and indent values to verify fix for QTBUG-5111.
|
||||
connect(ui->spinBoxFontPointSize, SIGNAL(valueChanged(int)), this, SLOT(setFontPointSize(int)));
|
||||
connect(ui->spinBoxIndentWidth, SIGNAL(valueChanged(int)), this, SLOT(setIndentWidth(int)));
|
||||
|
||||
textCursor = new QTextCursor(ui->textEdit->document());
|
||||
|
||||
// Initialize text list with different formats and layouts
|
||||
QTextListFormat listFormat;
|
||||
// disc
|
||||
listFormat.setStyle(QTextListFormat::ListDisc);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("disc one");
|
||||
textCursor->insertText("\ndisc two");
|
||||
// 1., 2.
|
||||
listFormat.setStyle(QTextListFormat::ListDecimal);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("decimal one");
|
||||
textCursor->insertText("\ndecimal two");
|
||||
// a., b.
|
||||
listFormat.setStyle(QTextListFormat::ListLowerAlpha);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("lower alpha one");
|
||||
textCursor->insertText("\nlower alpha two");
|
||||
// A., B.
|
||||
listFormat.setStyle(QTextListFormat::ListUpperAlpha);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("upper alpha one");
|
||||
textCursor->insertText("\nupper alpha two");
|
||||
// Indent 1
|
||||
listFormat.setStyle(QTextListFormat::ListDisc);
|
||||
listFormat.setIndent(1);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("indent 1 one");
|
||||
textCursor->insertText("\nindent 2 two");
|
||||
// Indent 2
|
||||
listFormat.setIndent(2);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("indent 2 one");
|
||||
textCursor->insertText("\nindent 2 two");
|
||||
// Indent 3
|
||||
listFormat.setIndent(3);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText("indent 3 one");
|
||||
textCursor->insertText("\nindent 3 two");
|
||||
// right to left: disc
|
||||
listFormat.setIndent(1);
|
||||
listFormat.setStyle(QTextListFormat::ListDisc);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText(QChar( 0x05d0)); // use Hebrew aleph to create a right-to-left layout
|
||||
textCursor->insertText("\n" + QString(QChar( 0x05d0)));
|
||||
// right to left: 1., 2.
|
||||
listFormat.setStyle(QTextListFormat::ListLowerAlpha);
|
||||
textCursor->insertList(listFormat);
|
||||
textCursor->insertText(QChar( 0x05d0)); // use Hebrew aleph to create a right-to-left layout
|
||||
textCursor->insertText("\n" + QString(QChar( 0x05d0)));
|
||||
|
||||
QFont font;
|
||||
setFontPointSize(font.pointSize());
|
||||
ui->textEdit->setFont(font);
|
||||
|
||||
setIndentWidth(static_cast<int>(ui->textEdit->document()->indentWidth()));
|
||||
}
|
||||
|
||||
void Widget::setFontPointSize(int value)
|
||||
{
|
||||
ui->textEdit->selectAll();
|
||||
ui->textEdit->setFontPointSize(value);
|
||||
}
|
||||
|
||||
void Widget::setIndentWidth(int value)
|
||||
{
|
||||
ui->textEdit->document()->setIndentWidth(value);
|
||||
}
|
||||
|
||||
Widget::~Widget()
|
||||
{
|
||||
delete ui;
|
||||
delete textCursor;
|
||||
}
|
||||
67
tests/manual/qtexteditlist/widget.h
Normal file
67
tests/manual/qtexteditlist/widget.h
Normal file
@ -0,0 +1,67 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
|
||||
** Contact: http://www.qt-project.org/legal
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and Digia. For licensing terms and
|
||||
** conditions see http://qt.digia.com/licensing. For further information
|
||||
** use the contact form at http://qt.digia.com/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Digia gives you certain additional
|
||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef WIDGET_H
|
||||
#define WIDGET_H
|
||||
|
||||
#include <QWidget>
|
||||
#include <QTextCursor>
|
||||
|
||||
namespace Ui {
|
||||
class Widget;
|
||||
}
|
||||
|
||||
class Widget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit Widget(QWidget *parent = 0);
|
||||
~Widget();
|
||||
public slots:
|
||||
void setFontPointSize(int value);
|
||||
void setIndentWidth(int value);
|
||||
private:
|
||||
Ui::Widget *ui;
|
||||
QTextCursor* textCursor;
|
||||
};
|
||||
|
||||
#endif // WIDGET_H
|
||||
61
tests/manual/qtexteditlist/widget.ui
Normal file
61
tests/manual/qtexteditlist/widget.ui
Normal file
@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Widget</class>
|
||||
<widget class="QWidget" name="Widget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>300</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Widget</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QTextEdit" name="textEdit"/>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayoutFontPointSize">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelFontSize">
|
||||
<property name="text">
|
||||
<string>Font point size:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="spinBoxFontPointSize">
|
||||
<property name="value">
|
||||
<number>10</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayoutIndentWidth">
|
||||
<item>
|
||||
<widget class="QLabel" name="labelIndentWidth">
|
||||
<property name="text">
|
||||
<string>Indent width:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QSpinBox" name="spinBoxIndentWidth">
|
||||
<property name="value">
|
||||
<number>40</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Loading…
Reference in New Issue
Block a user