16/09/2013 20:31, Hashini Senaratne:
Will we be able to show the same repository under, gsoc/scroll/master? Or I
can create a repository in my GitHub account.
What I would do is remove what is currently in gsoc/scroll/master, and
replace it with the new code. Two ways of doing it
- import all the commits in scroll/testing. This is going to be messy,
since most of it is trial and error. Anyway, the tool for this is
git cherry-pick <sha>
- create a nice and tidy scroll/master repo with a few commits, or maybe
one for where we are now and one for removing insettabulat special code
once you got it right in testing.
I prefer the later option. The code for scrolling was very difficult to
get right, but the fact is that current changes are not that large:
fantomas (scroll/testing): git diff origin/master src |diffstat
BufferView.cpp | 66
+++++++++++++++++++++++++++++++++++++++--
Cursor.cpp | 58 +++++++++++++++++++++++++++++++++++-
Cursor.h | 67
++++++++++++++++--------------------------
CursorSlice.h | 2 +
TextMetrics.cpp | 22 +++++++++++--
frontends/qt4/GuiWorkArea.cpp | 9 +++++
mathed/InsetMathHull.cpp | 2 -
7 files changed, 174 insertions(+), 52 deletions(-)
In the count above there are a few changes that are wrong, probably
because we forget to rebase some stuff, I am not sure actually.
You should first review this diff and understand what should be fixed.
For example, there is in origin/master a chunk of comments in Cursor.h
coming from a description I did which is not in gsoc/scroll/master. You
should re-add it I am not sure what happened. Also the changes in
mathed/InsetMathHull.cpp should not be there. There are a couple (one)
other example that does not look correct.
So before trying to move anything to scroll/master, please review the
diff above and resolve differences that should not be there. Then you
will obtain a diff that is probably short enough to be one commit. If
you add a very good commit log to it (if you want I can proofread it
before commiting, or we can amend it later), it is the best form for
integration in LyX.
Of course, this will make your work look like a small one but
1/ you have the scroll/testing branch that shows how painful it was to
get there
2/ remember that nobody dared implement this for years, because nobody
around here knows how this redraw stuff works in its intimate details.
This is something that shall be put forward in the final report(s).
I also see that there is no time to complete the UI based solution. But I
would like to work with your help after the final submission.
That would be an excellent idea :)
Regards,
JMarc
