A few small timeline fixes #3709
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- The .png file only exists in the Qt resource file, since the image resources were moved out of the packaged tree. The SVG version is still present in src/images/.
ferdnyc
changed the title
- By styling the playhead_top div with `margin-left: -12px` and adjusting the position of the other playhead components accordingly, the need for a `playheadOffset` scope variable can be completely eliminated. All of its positioning code becomes slightly simpler.
ferdnyc
added
the
timeline
|
Merging, as these are all nice-to-haves and should hopefully be pretty unobjectionable. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains a few small tweaks to things that affect how OpenShot operates very minimally, if at all.
div.playhead-topelement that holds the playhead "handle" with amargin-left: -12px, and tweaking some of the other playhead component positioning to match, the playhead's "anchor" point is moved to its center, instead of being at its left edge. This means that all of the$scope.playheadOffsetadjustments the code makes become completely unnecessary. So, this PR applies that negative margin change, and removes$scope.playheadOffsetfrom all of the calculations where it was being used (as well as removing the variable from the scope itself), making for slightly simpler, cleaner code.MainWindowobject into the JavaScript environment (asmainWindow). That's a lot of data to inject, becausemain_window.pycreates a big, heavy object full of bindings and local storage.But then
mainWindowis never once used for anything on the JS side, making it totally unnecessary. Gone now.src/images/AudioThumbnail.pngwere all changed to referencesrc/images/AudioThumbnail.svg, as the PNG version now only exists in the resource file. This mostly only affects the Timeline debug mode when it's running in a web browser, though technically most of the references appeared in the Python code. I'm reasonably sure those were only used as fallback/legacy paths, though, from before the thumbnail server.src/timeline/media/images/that aren't used for anything. (For the most part, they never really were. These were early development versions, dating back to 2014 with no changes since, of things that went in a different direction. Like a first-draft set of effect icons, before that design morphed into the HTML-based "Skittles" we use today.)