Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ui glitch where track ticks did not line up #4171

Merged
merged 1 commit into from Mar 21, 2018
Merged

Fix ui glitch where track ticks did not line up #4171

merged 1 commit into from Mar 21, 2018

Conversation

@enp2s0
Copy link
Contributor

@enp2s0 enp2s0 commented Feb 11, 2018

This fixes the a bug (see #4155) where the instrument-track ticks did not line up with the timeline. This only applies to stable-1.2. A different fix would be required to fix master, the code is completely different.

@BaraMGB
Copy link
Contributor

@BaraMGB BaraMGB commented Mar 7, 2018

Can you explain what's the difference between fixing stable and master?

@Umcaruje Umcaruje added this to In Progress in Release LMMS 1.2.0-RC6 Mar 9, 2018
@enp2s0
Copy link
Contributor Author

@enp2s0 enp2s0 commented Mar 17, 2018

@BaraMGB they're different branches. stable-1.2 is a stable release and is only accepting bug fixes and not new features (to prevent code from breaking), master is the bleeding edge development version and is the most up-to-date (but sometimes has new bugs). Because stable and master had different code for the bug I was fixing, my for only worked in stable and not master.

@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Mar 18, 2018

Because stable and master had different code for the bug I was fixing,

I think this was the question. What has changed between stable-1.2 and master?
Here is the output of git diff stable-1.2 master -- src/tracks/Pattern.cpp

The changes in this PR touches code here that needs some 'lovin' in order to be mergeable into master.

@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Mar 19, 2018

Merge? (We merge this now and keep #4155 open for a final fix in master.)

@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Mar 21, 2018

I believe this line in master is the equivalent of the line that's changed in this PR.

const float pixelsPerTact = ( baseWidth - 2 * TCO_BORDER_WIDTH ) / (float) m_pat->length().getTact();

Merging.

@zonkmachine zonkmachine merged commit 87e6b48 into LMMS:stable-1.2 Mar 21, 2018
1 check passed
@zonkmachine zonkmachine moved this from In Progress to Done in Release LMMS 1.2.0-RC6 Mar 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants