Commit Graph

85 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer
3b1e1231f1 Fixed position of folding markers with QGtkStyle
Not a brilliant solution, but it works. Changing the style itself would
cause problems in other places where the PE_IndicatorBranch is drawn.

Reviewed-by: Jens Bache-Wiig
2009-05-12 13:01:34 +02:00
Roberto Raggi
12e27549b0 Introduced IFile::checkPermission() and use it to reduce the number of calls to isWritable().
Done with: mae
2009-05-08 15:50:15 +02:00
mae
68d85acaa5 supress parentheses animation if the position was part of the previous
parentheses highlighting. This makes the Delete key work smoother when
the cursor is positioned behind a closing parenthesis.
2009-05-06 11:18:56 +02:00
Thorbjørn Lindeijer
358a355315 Fixed faked transparency of folding makers with Plastique style
Plastique is manually blending with the background color, so make sure
we set the background to the highlight color when the folding marker is
hovered.
2009-05-05 10:25:18 +02:00
mae
78e4822390 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-05-04 14:47:36 +02:00
mae
a1d7db7e15 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-05-04 13:47:39 +02:00
Thorbjørn Lindeijer
9cd7d3ac10 Fixed folding markers not showing up with the Mac style 2009-05-04 13:46:55 +02:00
mae
7a1fe81426 give the wave underline more priority, so it will be above search results
and find scopes (but below the main selection)
2009-05-04 13:46:50 +02:00
Thorbjørn Lindeijer
baeb67133b Removed the fancy folding bar
The improved traditional bar will hopefully keep everybody happy.
2009-05-04 12:04:40 +02:00
Thorbjørn Lindeijer
3236678c7b Fixed resetting of block highlighting when leaving the extra area
When the block highlighting was enabled, it would still get removed when
the mouse left the extra area. Now it changes back to the text cursor
position.

Done with mae.
2009-05-04 11:47:28 +02:00
Thorbjørn Lindeijer
0c0cacb71e Fixed the block highlighting in combination with right margin
The highlights would extend on top of the right column margin. It looks
better when they don't.

Done with mae.
2009-05-04 11:33:59 +02:00
Thorbjørn Lindeijer
b7e12e23f4 Changed classic folding markers
This new look fits better with the new behaviour. Also, the
collapse/expand markers are now drawn by the style.
2009-05-04 11:13:31 +02:00
mae
b4f78421ad fancy folding bar: shift the active folding bar area for the function body case
one up.
2009-04-29 17:11:37 +02:00
mae
b1a024e55b some corner cases fixing 2009-04-29 16:46:54 +02:00
mae
ffe9fe58f7 support old-fashioned +/- folding bar, but improved 2009-04-29 15:37:38 +02:00
mae
94a713c38e parentheses matching and block highlighting polishing 2009-04-29 12:17:42 +02:00
mae
3b917fde19 mac fix for parenthesis matching 2009-04-28 19:02:58 +02:00
mae
5df82ab502 experiment with a different way of doing parenthesis matching. This is not finished and
work in progress.
2009-04-28 18:34:58 +02:00
mae
606ce15431 more tweaking 2009-04-28 12:55:31 +02:00
mae
a8be2532d1 tune block highlighting
done with Thorbjorn
2009-04-28 11:43:13 +02:00
Thorbjørn Lindeijer
968a3c0f9f Added 'current line number' to color theme settings
Recently it was made to highlight black or write, which isn't nice for
everybody. Now it is dark gray by default, and can be customized. Bold
and italic are also supported.
2009-04-27 14:10:54 +02:00
Thorbjørn Lindeijer
ffaea3fcd5 Fixed flicker when updating highlighting of matching brace
By not removing it before setting an updated selection.

Reviewed-by: mae
2009-04-27 13:01:28 +02:00
mae
8d59b0ab64 eat tooltip events when control is pressed, otherwise the tools
destroy the navigation experience
2009-04-24 18:16:30 +02:00
mae
7f64e11cc1 the comma operator in C++ is evil 2009-04-24 18:12:36 +02:00
mae
b9e376f5dd fix block highlighting off-by-one 2009-04-24 18:08:22 +02:00
mae
5f89921179 polishing of block highlighting, and a new folder bar. 2009-04-24 16:44:48 +02:00
mae
dfd2c5dbc3 small block highlighting cleanup for the no-wrapping case with overlong lines 2009-04-23 20:11:00 +02:00
mae
a180345b16 make move line up/down only move the selected line if the end of the selection
is at the beginning of the next block. Join the undo commands for subsequent moves.
2009-04-23 19:24:57 +02:00
mae
a71436649c removed the folding ribbon from the default configuration, instead
turned a new block highlighting mechanism on.
2009-04-23 17:28:53 +02:00
jasplin
160247834a Revert "Workaround backspace issue for now"
This reverts commit ebfcd35ace.
Qt 4.5 commit b51dd5a7b328291c5dbda540ce228e7d867662cb eliminates the
need for this workaround for now.
2009-04-23 14:46:23 +02:00
mae
4d708fa408 new text editor option "Highlight blocks" 2009-04-22 20:04:38 +02:00
mae
ebfcd35ace Workaround backspace issue for now 2009-04-22 18:37:43 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
con
cd638b98bd Keep cursor position and scroll state when reloading text editors.
Regression coming from the new navigation history mechanism.
2009-04-02 17:56:38 +02:00
hjk
285fa4a5b3 fakevim: remove "fakevim" option from text editor settings as it has a
page of its own now
2009-03-30 15:39:13 +02:00
Thorbjørn Lindeijer
8088ca2c43 Stop fighting over which mouse cursor to show on text editor
The BaseTextEditor was unconditionally setting the mouse cursor on each
mouse move event, after which the CPPEditor would set it as well when
the mouse was above a link. This caused some mouse cursor flickering, so
now the cursor is only set when it's supposed to change.

Also fixed an issue where the link wasn't removed when leaving the text
editor with the mouse while Ctrl was pressed.
2009-03-25 12:10:56 +01:00
con
40eab8980b Last 'finish' of this iteration of navigation history.
Task:     240811
2009-03-19 16:37:05 +01:00
con
37973823c5 One step to being able to jump back in a senseful way... 2009-03-19 16:37:05 +01:00
con
fc79c737b3 Add last edit position to navigation history.
Task:     240811
2009-03-19 16:37:05 +01:00
con
f84c651428 Refactor navigation history again, put last edit position in history
Task:     240811
2009-03-19 16:37:05 +01:00
Thorbjørn Lindeijer
551b9f487e Moving some code together that belongs together 2009-03-17 18:25:44 +01:00
Thorbjørn Lindeijer
70d5649428 Don't show code folding margin when it isn't supported
Introduce setCodeFoldingSupported to the BaseTextEditor, and only
enabled it for the C++ and QtScript editors. This removes the useless
margin meant for code folding markers from the plain text editor and
.pro file editor.
2009-03-17 18:25:44 +01:00
Thorbjørn Lindeijer
1f3908e0a5 Avoid adding navigation history twice
This code is already in TextEditor::BaseTextEditor::openEditorAt.
2009-03-05 17:14:37 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
f3141d99c4 Merge branch '1.0.0'
Conflicts:
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
	src/plugins/debugger/gdbengine.cpp
2009-02-17 17:56:18 +01:00
Thorbjørn Lindeijer
7ec3f73594 Center the cursor after (un)collapse all
Requested on the mailing list. Increases usability.
2009-02-17 16:14:52 +01:00
Thorbjørn Lindeijer
3230017eaf Merge branch '1.0.0'
Conflicts:
	src/libs/cplusplus/Overview.h
	src/libs/cplusplus/TypePrettyPrinter.cpp
	src/plugins/cpptools/cppcodecompletion.cpp
2009-02-16 18:42:22 +01:00
Thorbjørn Lindeijer
cbcc2e518d Don't move cursor on collapse/uncollapse
When the cursor isn't within the block that's being collapsed, it
shouldn't be moved. When it is, it will now move upwards instead of to
the start of the line.

Reviewed-by: mae
2009-02-13 17:29:59 +01:00
con
1dcabe5a3a Merge branch '1.0.0'
Conflicts:
	tests/auto/cplusplus/shared/shared.pri
	tests/auto/cplusplus/shared/shared.pro
2009-02-09 10:54:36 +01:00
Matthias Ettrich
87b8a97447 fix off by one when selecting block up or the previous open parenthesis. 2009-02-04 19:08:10 +01:00