Commit MetaInfo

Revision208ef80d34a1c40a0ede21a2401ee89649ea9c55 (tree)
Time2017-10-22 23:13:02
Author <exeal@user...>

Log Message

.

Change Summary

Incremental Difference

diff -r 03f84de68d10 -r 208ef80d34a1 ascension/ascension/kernel/document.hpp
--- a/ascension/ascension/kernel/document.hpp Sun Oct 22 23:10:20 2017 +0900
+++ b/ascension/ascension/kernel/document.hpp Sun Oct 22 23:13:02 2017 +0900
@@ -231,7 +231,7 @@
231231
232232 private:
233233 // void doSetModified(bool modified) BOOST_NOEXCEPT;
234- void fireDocumentAboutToBeChanged() BOOST_NOEXCEPT;
234+ void fireDocumentAboutToBeChanged(const DocumentChange& c, bool updateAllPoints = true) BOOST_NOEXCEPT;
235235 void fireDocumentChanged(const DocumentChange& c, bool updateAllPoints = true) BOOST_NOEXCEPT;
236236 void initialize();
237237 void partitioningChanged(const Region& changedRegion) BOOST_NOEXCEPT;
diff -r 03f84de68d10 -r 208ef80d34a1 ascension/ascension/viewer/caret.hpp
--- a/ascension/ascension/viewer/caret.hpp Sun Oct 22 23:10:20 2017 +0900
+++ b/ascension/ascension/viewer/caret.hpp Sun Oct 22 23:13:02 2017 +0900
@@ -210,21 +210,7 @@
210210 // detail.InputMethodQueryEventHandler
211211 std::pair<const StringPiece, StringPiece::const_iterator> querySurroundingText() const BOOST_NOEXCEPT override;
212212 private:
213- class SelectionAnchor : public VisualPoint {
214- public:
215- SelectionAnchor(kernel::Document& document, const kernel::Position& position);
216- explicit SelectionAnchor(const kernel::Point& other);
217- explicit SelectionAnchor(const VisualPoint& other);
218- SelectionAnchor(TextArea& textArea, const kernel::Position& position);
219- void beginInternalUpdate(const kernel::DocumentChange& change) BOOST_NOEXCEPT;
220- void endInternalUpdate() BOOST_NOEXCEPT;
221- bool isInternalUpdating() const BOOST_NOEXCEPT;
222- const kernel::Position& positionBeforeInternalUpdate() const BOOST_NOEXCEPT;
223- private:
224- using kernel::Point::adaptToDocument;
225- boost::optional<kernel::Position> positionBeforeUpdate_;
226- };
227- std::unique_ptr<SelectionAnchor> anchor_;
213+ boost::optional<TextHit> anchor_;
228214 std::unique_ptr<CaretPainter> painter_;
229215 #if BOOST_OS_WINDOWS
230216 LCID clipboardLocale_;
@@ -248,13 +234,11 @@
248234 } shapeCache_;
249235 struct Context {
250236 bool yanking; // true when right after pasted by using clipboard ring, and waiting for next cycle of ring
251- bool leaveAnchorNext; // true if should leave the anchor at the next movement
252- bool leadingAnchor; // true if in anchor_->moveTo calling, and ignore pointMoved
253237 std::unique_ptr<VirtualBox> selectedRectangle; // for rectangular selection. null when the selection is linear
254238 bool typing; // true when inputCharacter called (see prechangeDocument)
239+ boost::optional<TextHit> anchorDestination;
255240 bool inputMethodCompositionActivated, inputMethodComposingCharacter;
256241 boost::optional<kernel::Position> lastTypedPosition; // the position the caret input character previously
257- boost::optional<SelectedRegion> regionBeforeMoved;
258242 boost::optional<std::pair<kernel::Position, kernel::Position>> matchBrackets; // matched brackets' positions. boost.none for none
259243 Context() BOOST_NOEXCEPT;
260244 } context_;
Show on old repository browser