-
Notifications
You must be signed in to change notification settings - Fork 548
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
Ruler refactor #4171
Ruler refactor #4171
Conversation
Also, should I be worried about the build error? |
@JacksonRG This PR seems to include all the other changes made in develop. It's a bit crazy looking now. @ferdnyc Is this normal, and will this merge correctly? Just double checking... |
d544377
to
ec56e40
Compare
Sorry, Totally missed your comment. Anyway, I just rebased onto develop (I think without breaking anything). Also since we were talking about openshot just letting users keep zooming in, I removed the scroll limmits. (at least if you scroll with |
da36153
to
ec56e40
Compare
Looking much better! |
@JacksonRG I just resolved the conflict on |
c8658ee
to
efc8f72
Compare
Super Zoom!
I've changed the ruler code so that you can zoom as much as you want with +/- keys. This does some math so that the number of pixels between ruler ticks is always a factor of the FPS (rounded). That way, as I start drawing the tick marks on a the first frame of a second, every following second on the timeline should be marked.
The ruler math
I did the factoring by adding to
functions.js
:Issues:
(These two issues are present in dev)