diff options
Diffstat (limited to 'src/MarginView.cxx')
| -rw-r--r-- | src/MarginView.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 8b6f80695..2382ce1a8 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -59,7 +59,7 @@ using namespace Scintilla; namespace Scintilla { void DrawWrapMarker(Surface *surface, PRectangle rcPlace, - bool isEndMarker, ColourDesired wrapColour) { + bool isEndMarker, ColourAlpha wrapColour) { const XYPOSITION extraFinalPixel = surface->Supports(SC_SUPPORTS_LINE_DRAWS_FINAL) ? 0.0f : 1.0f; @@ -132,22 +132,22 @@ void MarginView::RefreshPixMaps(Surface *surfaceWindow, const ViewStyle &vsDraw) const PRectangle rcPattern = PRectangle::FromInts(0, 0, patternSize, patternSize); // Initialize default colours based on the chrome colour scheme. Typically the highlight is white. - ColourDesired colourFMFill = vsDraw.selbar; - ColourDesired colourFMStripes = vsDraw.selbarlight; + ColourAlpha colourFMFill = vsDraw.selbar; + ColourAlpha colourFMStripes = vsDraw.selbarlight; - if (!(vsDraw.selbarlight == ColourDesired(0xff, 0xff, 0xff))) { + if (!(vsDraw.selbarlight == ColourAlpha(0xff, 0xff, 0xff))) { // User has chosen an unusual chrome colour scheme so just use the highlight edge colour. // (Typically, the highlight colour is white.) colourFMFill = vsDraw.selbarlight; } - if (vsDraw.foldmarginColour.isSet) { + if (vsDraw.foldmarginColour) { // override default fold margin colour - colourFMFill = vsDraw.foldmarginColour; + colourFMFill = vsDraw.foldmarginColour.value(); } - if (vsDraw.foldmarginHighlightColour.isSet) { + if (vsDraw.foldmarginHighlightColour) { // override default fold margin highlight colour - colourFMStripes = vsDraw.foldmarginHighlightColour; + colourFMStripes = vsDraw.foldmarginHighlightColour.value(); } pixmapSelPattern->FillRectangle(rcPattern, colourFMFill); @@ -195,7 +195,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, surface->FillRectangle(rcSelMargin, invertPhase ? *pixmapSelPattern : *pixmapSelPatternOffset1); } else { - ColourDesired colour; + ColourAlpha colour; switch (vs.ms[margin].style) { case SC_MARGIN_BACK: colour = vs.styles[STYLE_DEFAULT].back; |