Skip to content

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

Merged
zonkmachine merged 1 commit into
LMMS:stable-1.2from
enp2s0:stable-1.2
Mar 21, 2018
Merged

Fix ui glitch where track ticks did not line up#4171
zonkmachine merged 1 commit into
LMMS:stable-1.2from
enp2s0:stable-1.2

Conversation

@enp2s0

@enp2s0 enp2s0 commented Feb 11, 2018

Copy link
Copy Markdown
Contributor

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

BaraMGB commented Mar 7, 2018

Copy link
Copy Markdown
Contributor

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

@enp2s0

enp2s0 commented Mar 17, 2018

Copy link
Copy Markdown
Contributor Author

@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
Copy Markdown
Contributor

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
Copy Markdown
Contributor

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

@zonkmachine

Copy link
Copy Markdown
Contributor

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
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants