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
d937ee55
Commit
d937ee55
authored
Dec 12, 2008
by
mae
Browse files
tweak collapse/expand short cuts, and do not draw collpase boxes
in ifdefed out sections
parent
18d84955
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/texteditor/basetexteditor.cpp
View file @
d937ee55
...
...
@@ -2283,9 +2283,11 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
}
}
collapseAfter
=
(
userData
->
collapseMode
()
==
TextBlockUserData
::
CollapseAfter
);
collapseThis
=
(
userData
->
collapseMode
()
==
TextBlockUserData
::
CollapseThis
);
hasClosingCollapse
=
userData
->
hasClosingCollapse
()
&&
(
previousBraceDepth
>
0
);
if
(
!
userData
->
ifdefedOut
())
{
collapseAfter
=
(
userData
->
collapseMode
()
==
TextBlockUserData
::
CollapseAfter
);
collapseThis
=
(
userData
->
collapseMode
()
==
TextBlockUserData
::
CollapseThis
);
hasClosingCollapse
=
userData
->
hasClosingCollapse
()
&&
(
previousBraceDepth
>
0
);
}
}
if
(
d
->
m_codeFoldingVisible
)
{
...
...
@@ -2318,10 +2320,12 @@ void BaseTextEditor::extraAreaPaintEvent(QPaintEvent *e)
bool
collapseNext
=
nextBlockUserData
&&
nextBlockUserData
->
collapseMode
()
==
TextBlockUserData
::
CollapseThis
;
==
TextBlockUserData
::
CollapseThis
&&
!
nextBlockUserData
->
ifdefedOut
();
bool
nextHasClosingCollapse
=
nextBlockUserData
&&
nextBlockUserData
->
hasClosingCollapseInside
();
&&
nextBlockUserData
->
hasClosingCollapseInside
()
&&
nextBlockUserData
->
ifdefedOut
();
bool
drawBox
=
((
collapseAfter
||
collapseNext
)
&&
!
nextHasClosingCollapse
);
...
...
@@ -3397,9 +3401,12 @@ void BaseTextEditor::collapse()
TextEditDocumentLayout
*
documentLayout
=
qobject_cast
<
TextEditDocumentLayout
*>
(
doc
->
documentLayout
());
QTC_ASSERT
(
documentLayout
,
return
);
QTextBlock
block
=
textCursor
().
block
();
QTextBlock
curBlock
=
block
;
while
(
block
.
isValid
())
{
if
(
TextBlockUserData
::
canCollapse
(
block
)
&&
block
.
next
().
isVisible
())
{
if
((
block
.
next
().
userState
())
>>
8
<=
(
textCursor
().
block
().
userState
()
>>
8
))
if
(
block
==
curBlock
)
break
;
if
((
block
.
next
().
userState
())
>>
8
<=
(
curBlock
.
previous
().
userState
()
>>
8
))
break
;
}
block
=
block
.
previous
();
...
...
src/plugins/texteditor/basetexteditor.h
View file @
d937ee55
...
...
@@ -138,7 +138,7 @@ public:
TextBlockUserData
*
data
=
static_cast
<
TextBlockUserData
*>
(
block
.
userData
());
if
(
!
data
||
data
->
collapseMode
()
!=
CollapseAfter
)
{
data
=
static_cast
<
TextBlockUserData
*>
(
block
.
next
().
userData
());
if
(
!
data
||
data
->
collapseMode
()
!=
TextBlockUserData
::
CollapseThis
)
if
(
!
data
||
data
->
collapseMode
()
!=
TextBlockUserData
::
CollapseThis
||
data
->
m_ifdefedOut
)
data
=
0
;
}
return
data
;
...
...
Write
Preview
Markdown
is supported
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