| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
| |
This reverts commit ec76c500996842c821af6ce5bfbf00942bf2238b.
It is also fixed by correctly updating blocks while handling document
changes in decf008e1562ea9ab72c2642ee49002e1c13c986
Change-Id: Ic81f71bc772616aff016bcf0bc86c8a1c325252a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
amends 37545e6d0060d644edf75995201cfb49f2126855
The assumption that from always points at the first character that
differs was wrong. The range can start with unmodified content. So in
total it is not save to base the end position for clear layouts on the
diff between added and removed characters, but we always need to clear
layout from 'from' to 'from + charsAdded'.
Change-Id: I5ad2678818b089f1ab722006bc1cb9e9ae9ec196
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
| |
Change-Id: Ia65b241fecd56c21864c89a10b66ed4d6d1ae8a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
| |
Fixes an issue with missing highlights in lines.
Change-Id: I38d6b23dae4327c8e215865f369ec2cf3c58e14e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
| |
In case there is an updated scheduled already when updating
the top block of the widget we might end up with an
uninitialized scrollbar on first open.
Fixes jumping to correct line when using git blame.
Amends 3b5dd15562bdc9660395dc9d014f5374a32ebb1c.
Change-Id: I339519259c354c3f473331e1d3dfe1a8876123ae
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
| |
Change-Id: I6346fede81ece0bcce8a1ca8068aac5b69e34c15
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
QScriptLine that is used in the QTextLayout implementation only takes
positive leading into account when calculating the line height. If we
assume the QFontMetricsF::lineSpacing as the offset for unlayouted
blocks we get a lot unnecessary updates during the layout process. So
provide a static function in PlainTextDocumentLayout that provides a
lineSpacing that is closer to the lineSpacing in a plain text document.
Change-Id: I0ee114cf29f8a2fcbd5a2efe3fcea636a98c7739
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
If the size of a layouted block is different than our assumed block size
we need to make sure that the offset cache is cleared for all items that
follow this block, otherwise the adjust scrollbar call uses wrong
offsets wich results in wrong scrollbar ranges.
Change-Id: I245e12e2b1b2c7822079f61e42b5bf18f617a168
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
| |
Push an update of the scrollbar to the end of the eventloop to avoid
updating the scrollbar multiple times for multiple document changes in a
single loop iteration.
Change-Id: Ia08ff7c047278e5cfa6eeb492bb132949df52040
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
| |
Layouts are potentially reused from vanished blocks so we need to make
sure the Formats are also cleared in the reused layout.
Change-Id: I87620d3628f34b5576757a7a6941e9ba4478e5d4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
|
|
|
|
| |
Fixes: QTCREATORBUG-33308
Change-Id: I1f5f86ec14932d00f2bb8815cbc299ed01c11486
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
|
|
|
|
|
|
| |
The result was always a block in front of the block for the line number.
This fixes flickering while scrolling by pixel via a touchpad.
Change-Id: I90e12f2034d8f3d05380f8155dc7abc69c45d043
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
|
|
|
| |
Change-Id: I5e8d71fd6458a6e33f054a47e40ff83e2176f1ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Just increasing the scrollbar by page step and moving the cursor to the
closest previous vertical offset is way cleaner than the previous
aproach.
Fixes: QTCREATORBUG-33447
Change-Id: I8c6fcfabd263d11ac088f93d34967c2a0682e61b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
| |
This will usually result in having the same block offset after
increasing the scrollbar value by page step.
Change-Id: I6e16dd52af2f6c0269b07329085b37dfaf565c94
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
| |
Do not access uncached offsets.
Change-Id: I9234cc0da486526d091c42d2f5c40849e4eb5dd1
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
| |
Change-Id: I5698b41906f4571eb9cf303d8f0f0a245161ea53
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
| |
Change-Id: If3267f6fca4a2abbcb4d4917653f814209283ea4
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
| |
Change-Id: Idceed0491f610637d38defece1643686f95151d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
|
| |
This ensures we do not set the top block number to a value that is not
reachable with the current scrollbar max value.
Fixes: QTCREATORBUG-33319
Change-Id: I150c4ba420416b059302848437fc5041e1dcdc0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
|
|
|
|
|
|
|
| |
The text cursor schould not be set to invisible blocks as it
automatically set them visible which causes a fold area to expand.
Change-Id: I9be186b1a0515cd591c2eeabaac62bcc565ac873
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
|
|
|
| |
Change-Id: Iafd1d9e7475a6b877fb87fbd875942259021b687
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
|
|
|
| |
Change-Id: I9870b33567c596ba14fa3ce74ab008cd4076adbc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
|
|
|
|
| |
Fixes: QTCREATORBUG-33321
Change-Id: I1c2e71a1972cb5d02a8a04a8fd0a01436e620334
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
| |
|
|
|
|
|
| |
warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
Change-Id: I86cdd3ffe75759b5761f9ac33a120b1c2ec52068
Reviewed-by: hjk <hjk@qt.io>
|
| |
|
|
|
|
|
| |
in that case the managed layout should deleted as well
Change-Id: I33a86335204bf784022c7a8a4af67aeba870dfe9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
|
|
|
| |
Change-Id: I960a6d2d005e1c9813ee11df015c594d64b4f5c8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
|
|
|
|
|
|
|
| |
This allows to wrap one document differently in editors with a different
width. In the future this will allow us also to display additional
information in just a single editor.
Change-Id: Ie1a07517be8756c473207e0db58f7d9924fdb5b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
src/plugins/coreplugin/plugininstallwizard.cpp
src/plugins/coreplugin/textdocument.cpp
Change-Id: I6c8d13a019f1e7142856037481172889f69ae971
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Add the Utils namespace to \class commands and \property commands
to show the docs
- Remove \since commands because they refer to Qt versions
- Use \inmodule QtCreator
- Remove \reimp commands or replace them with \overload
- Marks some docs \internal
- Add \c formatting for references to functions that are not documented
- Consistently format true and false with \c
- Replaced references to code snippets in the Qt module docs with
hard-coded snippets
- Fix other minor issues
Change-Id: I63da28c137145d65c6455540fa55d4dc5761318c
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| | |
| |
| |
| |
| | |
Change-Id: I968ddc798c6f66072947031bab2dd3855a99bdee
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
Change-Id: Iac555437405e993475736232b3cf2402cf9fe8ed
|
| | |
| |
| |
| |
| |
| |
| | |
... while the topline is only partially visible.
Change-Id: I21d0f576c70f91dd804cb71cf60f62c06f11fe77
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |\|
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/utils/unarchiver/unarchiver.qbs
Change-Id: Id20ff632e87c22147fb2f7a355cf7cc00ff5086c
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The assumtion that QFontMetrics::lineSpacing is equal to the height of a
text layout with a single line is wrong. In the layouting process the
height is rounded up, but in QFontMetrics::lineSpacing it is rounded to
the closest integer.
Fixes: QTCREATORBUG-32979
Change-Id: Ic0dc9016d0e9cdca0691b3fc3f88868b11b8950a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
Change-Id: If5ab8dda785255d168d7765f33da2b4fe3817183
|
| | |
| |
| |
| |
| |
| | |
Change-Id: I07eeafe159154505c50686a879ca1e9227cd80f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |/
|
|
|
| |
Change-Id: I983e4c74a9a2d5c271056a75a5301e566076f524
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
| |
Amends 333beeb8223fad146ee78bc646640d529d3f01d2.
Change-Id: I8b071904691e086dc0e35b10ff8ec854c0bc586a
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
|
|
|
| |
The code paths that changes the document layout already resets the
member.
Change-Id: I6045ff9c9da2c7e14811234a33c43b670973786f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
| |
Change-Id: Id693de1d3a5f2f272523d7f8608901a505687ce4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
| |
Fixes: QTCREATORBUG-32897
Change-Id: I2d15470f4c81f179b9ac29977bb45bbf7f8f0219
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|
| |
|
|
|
|
| |
Change-Id: I9ac45bb3ce0c5e3a7d75fd191d3b1c5d8d9f2b08
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
|
| |
|
|
|
|
|
|
|
|
| |
Accessing the cursorRect function is needed in some cases for the
Squish tests.
Amends cfc26cdf79b94888c1759636eff548b2378f93f3.
Change-Id: I58e602c1b4c4ab918166ffa758f0675203619d81
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Changing the base of TextEditor::TextEditorWidget from QPlainTextEdit to
Utils::PlainTextEdit made some functions of the base class inaccessible
for squish. So we need to use the properties or make the used functions
available via Q_PROPERTY.
Fixes: QTCREATORBUG-32776
Change-Id: Ie3c45b2de958a9b82a4b4323558830c993187c52
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
|
|
|
| |
.../src/libs/utils/plaintextedit/widgettextcontrol.cpp:2064:13: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
.../src/libs/utils/plaintextedit/widgettextcontrol.cpp:2063:19: warning: unused variable 'window' [-Wunused-variable]
Change-Id: Ic6dc6c369d694c4876d88e126f7103f91fa4745e
Reviewed-by: David Schulz <david.schulz@qt.io>
|
| |
|
|
|
| |
Change-Id: Ic3f700c48f05e2d231021379a5e154b23c2d1858
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
|
| |
|
|
|
|
|
|
| |
The macro already contain a ';'. Removing the argument or
[[maybe_unused]] would maybe even a better approach.
Change-Id: I31750d10a4f252c667e7c0e5e13bf1085dbe11a2
Reviewed-by: hjk <hjk@qt.io>
|
| |
|
|
|
| |
Change-Id: Ibc8eb9b5aac4329cc38f4e8e0421d17d8628d2bf
Reviewed-by: David Schulz <david.schulz@qt.io>
|
|
|
The layout of a text editor is part of the document and not the editor.
This results in not being able to position blocks differently in
multiple editors.
As a first step fork QPlainTextEdit with all the private dependencies.
Change-Id: Ie2da2613a966fe1958b6dbade4b7ff40e8858f62
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
|