Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
7391ba38
Commit
7391ba38
authored
Feb 08, 2010
by
con
Browse files
Fix navigation history issues.
Separating navigation history logic from updating of highlights.
parent
f133d0ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/texteditor/basetexteditor.cpp
View file @
7391ba38
...
...
@@ -223,7 +223,7 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
d
->
m_searchResultFormat
.
setBackground
(
QColor
(
0xffef0b
));
slotUpdateExtraAreaWidth
();
slotCursorPositionChanged
();
updateHighlights
();
setFrameStyle
(
QFrame
::
NoFrame
);
d
->
m_delayedUpdateTimer
=
new
QTimer
(
this
);
...
...
@@ -3198,7 +3198,11 @@ void BaseTextEditor::slotCursorPositionChanged()
}
else
if
(
d
->
m_contentsChanged
)
{
saveCurrentCursorPositionForNavigation
();
}
updateHighlights
();
}
void
BaseTextEditor
::
updateHighlights
()
{
if
(
d
->
m_parenthesesMatchingEnabled
&&
hasFocus
())
{
// Delay update when no matching is displayed yet, to avoid flicker
if
(
extraSelections
(
ParenthesesMatchingSelection
).
isEmpty
()
...
...
@@ -4774,7 +4778,7 @@ void BaseTextEditor::changeEvent(QEvent *e)
void
BaseTextEditor
::
focusInEvent
(
QFocusEvent
*
e
)
{
QPlainTextEdit
::
focusInEvent
(
e
);
slotCursorPositionChanged
();
updateHighlights
();
}
void
BaseTextEditor
::
focusOutEvent
(
QFocusEvent
*
e
)
...
...
@@ -5157,7 +5161,7 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
d
->
m_highlightBlocksInfo
=
BaseTextEditorPrivateHighlightBlocks
();
}
slotCursorPositionChanged
();
updateHighlights
();
viewport
()
->
update
();
extraArea
()
->
update
();
}
...
...
src/plugins/texteditor/basetexteditor.h
View file @
7391ba38
...
...
@@ -626,6 +626,7 @@ private:
void
moveLineUpDown
(
bool
up
);
void
copyLineUpDown
(
bool
up
);
void
saveCurrentCursorPositionForNavigation
();
void
updateHighlights
();
void
updateCurrentLineHighlight
();
void
drawFoldingMarker
(
QPainter
*
painter
,
const
QPalette
&
pal
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment