xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move overlaps function to selection.hh

Browse Source
This commit is contained in:
Maxime Coste 2012-11-12 20:27:56 +01:00
parent 77272db0fd
commit 14f980e4e0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/editor.cc
View File

@ -99,13 +99,6 @@ std::vector<String> Editor::selections_content() const
return contents;
}
static bool overlaps(const SelectionAndCaptures& lhs,
const SelectionAndCaptures& rhs)
{
return (lhs.first() <= rhs.first() and lhs.last() >= rhs.first()) or
(lhs.first() <= rhs.last() and lhs.last() >= rhs.last());
}
static void merge_overlapping(SelectionAndCapturesList& selections)
{
for (size_t i = 0; i < selections.size(); ++i)

8
src/selection.hh
View File

@ -75,6 +75,14 @@ struct SelectionAndCaptures
const BufferIterator& last() const { return selection.last(); }
};
inline bool overlaps(const SelectionAndCaptures& lhs,
const SelectionAndCaptures& rhs)
{
return (lhs.first() <= rhs.first() and lhs.last() >= rhs.first()) or
(lhs.first() <= rhs.last() and lhs.last() >= rhs.last());
}
typedef std::vector<SelectionAndCaptures> SelectionAndCapturesList;
}