Mercurial > jwe > octave
changeset 22180:beaacfca0055
Stop bookmarks being hidden by breakpoints / execution point (bug #48292)
* marker.h (editor_markers): List marker types from biggest to
smallest.
* file-editor-tab.cc (file_Editor_tab::file_editor_tab):
Give execution point a different shape from bookmarks.
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Thu, 30 Jun 2016 18:28:56 +1000 |
parents | 603f0d752de2 |
children | acdd8983d308 |
files | libgui/src/m-editor/file-editor-tab.cc libgui/src/m-editor/marker.h |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor-tab.cc Sat May 28 20:08:56 2016 +1000 +++ b/libgui/src/m-editor/file-editor-tab.cc Thu Jun 30 18:28:56 2016 +1000 @@ -157,9 +157,9 @@ _edit_area->setMarkerBackgroundColor (QColor (192,0,0), marker::breakpoint); _edit_area->markerDefine (QsciScintilla::Circle, marker::cond_break); _edit_area->setMarkerBackgroundColor (QColor (255,127,0), marker::cond_break); - _edit_area->markerDefine (QsciScintilla::RightTriangle, marker::debugger_position); + _edit_area->markerDefine (QsciScintilla::RightArrow, marker::debugger_position); _edit_area->setMarkerBackgroundColor (QColor (255,255,0), marker::debugger_position); - _edit_area->markerDefine (QsciScintilla::RightTriangle, + _edit_area->markerDefine (QsciScintilla::RightArrow, marker::unsure_debugger_position); _edit_area->setMarkerBackgroundColor (QColor (192,192,192), marker::unsure_debugger_position);
--- a/libgui/src/m-editor/marker.h Sat May 28 20:08:56 2016 +1000 +++ b/libgui/src/m-editor/marker.h Thu Jun 30 18:28:56 2016 +1000 @@ -42,12 +42,15 @@ public: + // List of all marker types + // If multiple markers are on the same line, the first one listed + // is drawn at the back, so big ones should be first. enum editor_markers { - bookmark, breakpoint, cond_break, unsure_breakpoint, + bookmark, debugger_position, unsure_debugger_position };