diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CallTip.cxx | 2 | ||||
| -rw-r--r-- | src/CellBuffer.cxx | 2 | ||||
| -rw-r--r-- | src/Document.cxx | 2 | ||||
| -rw-r--r-- | src/EditView.cxx | 4 | ||||
| -rw-r--r-- | src/Geometry.h | 8 | ||||
| -rw-r--r-- | src/Indicator.cxx | 4 | ||||
| -rw-r--r-- | src/UniConversion.h | 2 | ||||
| -rw-r--r-- | src/ViewStyle.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/CallTip.cxx b/src/CallTip.cxx index 18caddea1..43afead55 100644 --- a/src/CallTip.cxx +++ b/src/CallTip.cxx @@ -345,7 +345,7 @@ void CallTip::SetPosition(bool aboveText) noexcept { } bool CallTip::UseStyleCallTip() const noexcept { - return useStyleCallTip; + return useStyleCallTip; } // It might be better to have two access functions for this and to use diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx index d94ffaaea..b922b08bb 100644 --- a/src/CellBuffer.cxx +++ b/src/CellBuffer.cxx @@ -523,7 +523,7 @@ void UndoHistory::TentativeCommit() { } bool UndoHistory::TentativeActive() const noexcept { - return tentativePoint >= 0; + return tentativePoint >= 0; } int UndoHistory::TentativeSteps() noexcept { diff --git a/src/Document.cxx b/src/Document.cxx index 01949dc5e..657191ee1 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -2081,7 +2081,7 @@ Sci::Position Document::FindText(Sci::Position minPos, Sci::Position maxPos, con const unsigned char charStartSearch = search[0]; if (forward && ((0 == dbcsCodePage) || (CpUtf8 == dbcsCodePage && !UTF8IsTrailByte(charStartSearch)))) { // This is a fast case where there is no need to test byte values to iterate - // so becomes the equivalent of a memchr+memcmp loop. + // so becomes the equivalent of a memchr+memcmp loop. // UTF-8 search will not be self-synchronizing when starts with trail byte const std::string_view suffix(search + 1, lengthFind - 1); while (pos < endSearch) { diff --git a/src/EditView.cxx b/src/EditView.cxx index 8a303faea..b0b87a9b1 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1458,7 +1458,7 @@ void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, c } } - // For multi-phase drawing draw the text last as transparent over any box + // For multi-phase drawing draw the text last as transparent over any box if (FlagSet(phase, DrawPhase::text)) { if (phasesDraw != PhasesDraw::One) { surface->DrawTextTransparentUTF8(rcText, fontText, @@ -1603,7 +1603,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt for (size_t r = 0; (r<model.sel.Count()) || drawDrag; r++) { const bool mainCaret = r == model.sel.Main(); SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret); - if ((vsDraw.DrawCaretInsideSelection(model.inOverstrike, imeCaretBlockOverride)) && + if ((vsDraw.DrawCaretInsideSelection(model.inOverstrike, imeCaretBlockOverride)) && !drawDrag && posCaret > model.sel.Range(r).anchor) { if (posCaret.VirtualSpace() > 0) diff --git a/src/Geometry.h b/src/Geometry.h index 6456af0e8..28241c5a9 100644 --- a/src/Geometry.h +++ b/src/Geometry.h @@ -260,7 +260,7 @@ class Stroke { public: ColourRGBA colour; XYPOSITION width; - constexpr Stroke(ColourRGBA colour_, XYPOSITION width_=1.0) noexcept : + constexpr Stroke(ColourRGBA colour_, XYPOSITION width_=1.0) noexcept : colour(colour_), width(width_) { } constexpr float WidthF() const noexcept { @@ -274,7 +274,7 @@ public: class Fill { public: ColourRGBA colour; - constexpr Fill(ColourRGBA colour_) noexcept : + constexpr Fill(ColourRGBA colour_) noexcept : colour(colour_) { } }; @@ -286,10 +286,10 @@ class FillStroke { public: Fill fill; Stroke stroke; - constexpr FillStroke(ColourRGBA colourFill_, ColourRGBA colourStroke_, XYPOSITION widthStroke_=1.0) noexcept : + constexpr FillStroke(ColourRGBA colourFill_, ColourRGBA colourStroke_, XYPOSITION widthStroke_=1.0) noexcept : fill(colourFill_), stroke(colourStroke_, widthStroke_) { } - constexpr FillStroke(ColourRGBA colourBoth, XYPOSITION widthStroke_=1.0) noexcept : + constexpr FillStroke(ColourRGBA colourBoth, XYPOSITION widthStroke_=1.0) noexcept : fill(colourBoth), stroke(colourBoth, widthStroke_) { } }; diff --git a/src/Indicator.cxx b/src/Indicator.cxx index 0dd9ba7c2..bd02a01d1 100644 --- a/src/Indicator.cxx +++ b/src/Indicator.cxx @@ -47,7 +47,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r const XYPOSITION ymid = PixelAlign(rc.Centre().y, pixelDivisions); - // This is a reasonable clip for indicators beneath text like underlines + // This is a reasonable clip for indicators beneath text like underlines PRectangle rcClip = rcAligned; rcClip.bottom = rcFullHeightAligned.bottom; @@ -242,7 +242,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r const XYPOSITION widthDot = std::round(strokeWidth); XYPOSITION x = std::floor(rc.left); while (x < rc.right) { - const PRectangle rcDot = PRectangle(x, ymid, + const PRectangle rcDot = PRectangle(x, ymid, x + widthDot, ymid + widthDot); surface->FillRectangle(rcDot, sacDraw.fore); x += widthDot * 2; diff --git a/src/UniConversion.h b/src/UniConversion.h index ead7aae57..95ff2ad43 100644 --- a/src/UniConversion.h +++ b/src/UniConversion.h @@ -80,7 +80,7 @@ inline bool UTF8IsNEL(const unsigned char *us) noexcept { return (us[0] == 0xc2) && (us[1] == 0x85); } -// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL. +// Is the sequence of 3 char a UTF-8 line end? Only the last two char are tested for a NEL. constexpr bool UTF8IsMultibyteLineEnd(unsigned char ch0, unsigned char ch1, unsigned char ch2) noexcept { return ((ch0 == 0xe2) && (ch1 == 0x80) && ((ch2 == 0xa8) || (ch2 == 0xa9))) || diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 66a853848..843efc660 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -70,7 +70,7 @@ struct CaretLineAppearance { }; struct CaretAppearance { - // Line, block, over-strike bar ... + // Line, block, over-strike bar ... Scintilla::CaretStyle style; // Width in pixels int width; |