← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/core/Mono.Texteditor/Mono.TextEditor/Gui/IconMargin.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/Mono.Texteditor/Mono.TextEditor/Gui/IconMargin.cs
57
57
                
58
58
                internal protected override void OptionsChanged ()
59
59
                {
60
 
                        backgroundColor = editor.ColorStyle.IconBarBg;
61
 
                        separatorColor = editor.ColorStyle.IconBarSeperator;
 
60
                        backgroundColor = editor.ColorStyle.IndicatorMargin.Color;
 
61
                        separatorColor = editor.ColorStyle.IndicatorMarginSeparator.Color;
62
62
                        
63
63
                        layout.FontDescription = editor.Options.Font;
64
64
                        layout.SetText ("!");
74
74
                        
75
75
                        DocumentLine lineSegment = args.LineSegment;
76
76
                        if (lineSegment != null) {
77
 
                                foreach (TextMarker marker in lineSegment.Markers) {
 
77
                                foreach (TextLineMarker marker in lineSegment.Markers) {
78
78
                                        if (marker is IIconBarMarker) 
79
79
                                                ((IIconBarMarker)marker).MousePress (args);
80
80
                                }
87
87
                        
88
88
                        DocumentLine lineSegment = args.LineSegment;
89
89
                        if (lineSegment != null) {
90
 
                                foreach (TextMarker marker in lineSegment.Markers) {
 
90
                                foreach (TextLineMarker marker in lineSegment.Markers) {
91
91
                                        if (marker is IIconBarMarker) 
92
92
                                                ((IIconBarMarker)marker).MouseRelease (args);
93
93
                                }
100
100
                        args.Editor.TooltipText = null;
101
101
                        DocumentLine lineSegment = args.LineSegment;
102
102
                        if (lineSegment != null) {
103
 
                                foreach (TextMarker marker in lineSegment.Markers) {
 
103
                                foreach (TextLineMarker marker in lineSegment.Markers) {
104
104
                                        if (marker is IIconBarMarker) 
105
105
                                                ((IIconBarMarker)marker).MouseHover (args);
106
106
                                }
113
113
                        ctx.Color = backgroundColor;
114
114
                        ctx.Fill ();
115
115
                        
116
 
                        ctx.MoveTo (x + Width - 1, y);
117
 
                        ctx.LineTo (x + Width - 1, y + lineHeight);
 
116
                        ctx.MoveTo (x + Width - 0.5, y);
 
117
                        ctx.LineTo (x + Width - 0.5, y + lineHeight);
118
118
                        ctx.Color = separatorColor;
119
119
                        ctx.Stroke ();
120
120
                        
121
121
                        if (lineSegment != null && line <= editor.Document.LineCount) {
122
 
                                foreach (TextMarker marker in lineSegment.Markers) {
 
122
                                foreach (TextLineMarker marker in lineSegment.Markers) {
123
123
                                        if (marker is IIconBarMarker) 
124
124
                                                ((IIconBarMarker)marker).DrawIcon (editor, ctx, lineSegment, line, x, y, (int)Width, editor.LineHeight);
125
125
                                }