Merge lp:~mzanetti/reminders-app/fix-autocorrection-formatting into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Michael Zanetti
Approved revision: 406
Merged at revision: 406
Proposed branch: lp:~mzanetti/reminders-app/fix-autocorrection-formatting
Merge into: lp:reminders-app
Prerequisite: lp:~mzanetti/reminders-app/confirm-autocorrection-on-save
Diff against target: 14 lines (+2/-2)
1 file modified
src/app/formattinghelper.cpp (+2/-2)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/fix-autocorrection-formatting
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Review via email: mp+255736@code.launchpad.net

Commit message

fix formatting with autocorrection enabled

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks good! Tested on krillin.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/formattinghelper.cpp'
2--- src/app/formattinghelper.cpp 2015-03-17 21:57:54 +0000
3+++ src/app/formattinghelper.cpp 2015-04-09 18:35:36 +0000
4@@ -72,8 +72,8 @@
5
6 void FormattingHelper::setCursorPosition(int position)
7 {
8- if (m_textCursor.position() == m_formatPosition + 1) {
9- m_textCursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
10+ if (m_formatPosition >= 0 && m_textCursor.position() == position) {
11+ m_textCursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor, position - m_formatPosition);
12 m_textCursor.setCharFormat(m_nextFormat);
13 }
14 m_textCursor.setPosition(position);

Subscribers

People subscribed via source and target branches