aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/EditView.h
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2017-03-31 18:19:38 +1100
committerNeil <nyamatongwe@gmail.com>2017-03-31 18:19:38 +1100
commit8ff947c9db5ab9f1a093434180bc05bfecb62c4d (patch)
tree6d36be4b73c70c73f5345eb30a043c843a9e6839 /src/EditView.h
parent63cf929d772aa829daa613114600ece511c9b2d7 (diff)
downloadscintilla-mirror-8ff947c9db5ab9f1a093434180bc05bfecb62c4d.tar.gz
Using Sci::Position and Sci::Line to mark variables that are document positions
and lines.
Diffstat (limited to 'src/EditView.h')
-rw-r--r--src/EditView.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/EditView.h b/src/EditView.h
index 9bdf1b86c..172a1ddbc 100644
--- a/src/EditView.h
+++ b/src/EditView.h
@@ -97,53 +97,53 @@ public:
bool LinesOverlap() const;
void ClearAllTabstops();
- XYPOSITION NextTabstopPos(int line, XYPOSITION x, XYPOSITION tabWidth) const;
- bool ClearTabstops(int line);
- bool AddTabstop(int line, int x);
- int GetNextTabstop(int line, int x) const;
- void LinesAddedOrRemoved(int lineOfPos, int linesAdded);
+ XYPOSITION NextTabstopPos(Sci::Line line, XYPOSITION x, XYPOSITION tabWidth) const;
+ bool ClearTabstops(Sci::Line line);
+ bool AddTabstop(Sci::Line line, int x);
+ int GetNextTabstop(Sci::Line line, int x) const;
+ void LinesAddedOrRemoved(Sci::Line lineOfPos, Sci::Line linesAdded);
void DropGraphics(bool freeObjects);
void AllocateGraphics(const ViewStyle &vsDraw);
void RefreshPixMaps(Surface *surfaceWindow, WindowID wid, const ViewStyle &vsDraw);
- LineLayout *RetrieveLineLayout(int lineNumber, const EditModel &model);
- void LayoutLine(const EditModel &model, int line, Surface *surface, const ViewStyle &vstyle,
+ LineLayout *RetrieveLineLayout(Sci::Line lineNumber, const EditModel &model);
+ void LayoutLine(const EditModel &model, Sci::Line line, Surface *surface, const ViewStyle &vstyle,
LineLayout *ll, int width = LineLayout::wrapWidthInfinite);
- Point LocationFromPosition(Surface *surface, const EditModel &model, SelectionPosition pos, int topLine,
+ Point LocationFromPosition(Surface *surface, const EditModel &model, SelectionPosition pos, Sci::Line topLine,
const ViewStyle &vs, PointEnd pe);
- Range RangeDisplayLine(Surface *surface, const EditModel &model, int lineVisible, const ViewStyle &vs);
+ Range RangeDisplayLine(Surface *surface, const EditModel &model, Sci::Line lineVisible, const ViewStyle &vs);
SelectionPosition SPositionFromLocation(Surface *surface, const EditModel &model, PointDocument pt, bool canReturnInvalid,
bool charPosition, bool virtualSpace, const ViewStyle &vs);
- SelectionPosition SPositionFromLineX(Surface *surface, const EditModel &model, int lineDoc, int x, const ViewStyle &vs);
- int DisplayFromPosition(Surface *surface, const EditModel &model, int pos, const ViewStyle &vs);
- int StartEndDisplayLine(Surface *surface, const EditModel &model, int pos, bool start, const ViewStyle &vs);
+ SelectionPosition SPositionFromLineX(Surface *surface, const EditModel &model, Sci::Line lineDoc, int x, const ViewStyle &vs);
+ Sci::Line DisplayFromPosition(Surface *surface, const EditModel &model, int pos, const ViewStyle &vs);
+ Sci::Position StartEndDisplayLine(Surface *surface, const EditModel &model, Sci::Position pos, bool start, const ViewStyle &vs);
- void DrawIndentGuide(Surface *surface, int lineVisible, int lineHeight, int start, PRectangle rcSegment, bool highlight);
+ void DrawIndentGuide(Surface *surface, Sci::Line lineVisible, int lineHeight, Sci::Position start, PRectangle rcSegment, bool highlight);
void DrawEOL(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
- int line, int lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart,
+ Sci::Line line, Sci::Position lineEnd, int xStart, int subLine, XYACCUMULATOR subLineStart,
ColourOptional background);
void DrawFoldDisplayText(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
- int line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase);
+ Sci::Line line, int xStart, PRectangle rcLine, int subLine, XYACCUMULATOR subLineStart, DrawPhase phase);
void DrawAnnotation(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
- int line, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
- void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, int line,
+ Sci::Line line, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
+ void DrawCarets(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line,
int xStart, PRectangle rcLine, int subLine) const;
void DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, PRectangle rcLine,
- Range lineRange, int posLineStart, int xStart,
+ Range lineRange, Sci::Position posLineStart, int xStart,
int subLine, ColourOptional background) const;
- void DrawForeground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, int lineVisible,
- PRectangle rcLine, Range lineRange, int posLineStart, int xStart,
+ void DrawForeground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line lineVisible,
+ PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart,
int subLine, ColourOptional background);
void DrawIndentGuidesOverEmpty(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
- int line, int lineVisible, PRectangle rcLine, int xStart, int subLine);
- void DrawLine(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, int line,
- int lineVisible, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
+ Sci::Line line, Sci::Line lineVisible, PRectangle rcLine, int xStart, int subLine);
+ void DrawLine(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll, Sci::Line line,
+ Sci::Line lineVisible, int xStart, PRectangle rcLine, int subLine, DrawPhase phase);
void PaintText(Surface *surfaceWindow, const EditModel &model, PRectangle rcArea, PRectangle rcClient,
const ViewStyle &vsDraw);
void FillLineRemainder(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
- int line, PRectangle rcArea, int subLine) const;
+ Sci::Line line, PRectangle rcArea, int subLine) const;
long FormatRange(bool draw, Sci_RangeToFormat *pfr, Surface *surface, Surface *surfaceMeasure,
const EditModel &model, const ViewStyle &vs);
};