JoshuaBonn1

[core]
	repositoryformatversion = 0
	filemode = false
	bare = false
	logallrefupdates = true
	symlinks = false
	ignorecase = true
[remote "origin"]
	url = https://github.com/JoshuaBonn1/MuseScore.git
	fetch = +refs/heads/*:refs/remotes/origin/*

JoshuaBonn1

Joshua Bonn@DESKTOP-RPS5INU MINGW64 /a/MuseScore (3-timeline-class)
$ git log
commit c8104f1fdb7038bae7a0526219ee675350e69bee (HEAD -> 3-timeline-class)
Author: Joshua Bonn <jebonn@comcast.net>
Date:   Wed May 31 16:19:02 2017 -0700

    Fix score focus, add coloring, fix docking widget
    selection in the grid moves to the correct location in the score
    add coloring to aid in testing
    allow docking to the bottom of the screen

JoshuaBonn1

Joshua Bonn@DESKTOP-RPS5INU MINGW64 /a/MuseScore (3-timeline-class)
$ git log
commit c8104f1fdb7038bae7a0526219ee675350e69bee (HEAD -> 3-timeline-class)
Author: Joshua Bonn <jebonn@comcast.net>
Date:   Wed May 31 16:19:02 2017 -0700

    Fix score focus, add coloring, fix docking widget
    selection in the grid moves to the correct location in the score
    add coloring to aid in testing
    allow docking to the bottom of the screen

JoshuaBonn1

Joshua Bonn@DESKTOP-RPS5INU MINGW64 /a/MuseScore (3-timeline-class)
$ git push
To https://github.com/JoshuaBonn1/MuseScore.git
 ! [rejected]            3-timeline-class -> 3-timeline-class (non-fast-forward)
error: failed to push some refs to 'https://github.com/JoshuaBonn1/MuseScore.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

JoshuaBonn1

11:32:31: Running steps for project mscore...
11:32:31: Starting: "C:\Program Files (x86)\CMake\bin\cmake.exe" --build . --target lrelease
Updating 'A:/MuseScore/share/locale/instruments_af.qm'...
    Generated 2 translation(s) (2 finished and 0 unfinished)
    Ignored 984 untranslated source text(s)
Updating 'A:/MuseScore/share/locale/instruments_ar.qm'...
    Generated 1 translation(s) (1 finished and 0 unfinished)
    Ignored 985 untranslated source text(s)
Updating 'A:/MuseScore/share/locale/instruments_ar_DZ.qm'...
    Generated 1 translation(s) (1 finished and 0 unfinished)

JoshuaBonn1

So, i was looking into the score focus bug when moving to a measure. 
I came across this code: https://github.com/JoshuaBonn1/MuseScore/blob/3-timeline-class/mscore/scoreview.cpp#L2873-L2886 
after looking into it, i found that the adjustCanvasPosition with one system on the page would try to retain the y value of the view
This is so as the playback went along, it would not jump to the top of a system if the user focuses on a specific stave during playback.
So, when I pass it a measure while the canvas is smaller than the system, it moves to the correct x position,
but attempts to keep the same y position. It seems I need to add code to adjust the canvas view to a specific y value where
the stave and measure i selected is located.

Also, I found out that the code in that link does not work if there are two systems on the same page but the view is still smaller than
the system. I tested this with SATB and Organ, which fits two systems in a page. When i zoomed into the Bass, and did playback,

JoshuaBonn1

pick 48e65395e Add Timeline Class
squash 92204830f sharing current code
squash 8377377a7 Added grid and selection functionality

# Rebase e9cea0268..8377377a7 onto e9cea0268 (3 commands)
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending

JoshuaBonn1

A:\MuseScore\mscore\timeline.cpp:55: error: invalid conversion from 'int' to 'Qt::DockWidgetArea' [-fpermissive]
       setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
                                                                       ^

JoshuaBonn1

$ git log
commit ec714f58576144593aa9240195a6104b35b51bb2 (HEAD -> 1-timeline-class, origi                                 n/1-timeline-class)
Author: Joshua Bonn <jebonn@comcast.net>
Date:   Wed May 24 22:28:13 2017 -0700

    Added grid and selection functionality

commit 30eb2fb574cf35c56ed25da4a8790fd25ea482e4
Author: lasconic <lasconic@gmail.com>
Date:   Wed May 24 23:27:33 2017 +0200

JoshuaBonn1

$ git push origin 1-timeline-class
To https://github.com/JoshuaBonn1/MuseScore.git
 ! [rejected]            1-timeline-class -> 1-timeline-class (non-fast-forward)
error: failed to push some refs to 'https://github.com/JoshuaBonn1/MuseScore.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
$ git status
On branch 1-timeline-class