Skip to content

Fix incorrect ruler snapping position and include track boundaries #6

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.

Sign up for GitHub

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

Open
in3omnia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect ruler snapping position and include track boundaries #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions src/otioview/ruler_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,20 +245,38 @@ def snap(self, direction, scene_width):
closest_left = scene_width - ruler_pos
closest_right = 0 - ruler_pos
move_to_item = None
move_to_end = None

for tw, frameNumber_tail, frameNumber_head in self.labels:
for item in tw:
d = item.x() - ruler_pos
if direction > 0 and d > 0 and d < closest_left:
d = item.x_value - ruler_pos
if direction > 0 and d >= 0 and d <= closest_left:
closest_left = d
move_to_item = item
elif direction < 0 and d < 0 and d > closest_right:
closest_right = d
move_to_item = item

if move_to_item:
self.setX(move_to_item.x())
self.update_frame()
elif direction > 0 and item == tw[-1]:
d += item.rect().width()
if d <= closest_left and d >= 0:
closest_left = d
move_to_end = item
elif direction < 0:
if d >= closest_right and d <= 0:
closest_right = d
move_to_item = item
move_to_end = None
if item == tw[-1]:
d_last = d + item.rect().width()
if d_last >= closest_right and d_last <= 0:
closest_right = d_last
move_to_end = item
move_to_item = None

if move_to_end and direction < 0:
self.setX(move_to_end.x_value + move_to_end.rect().width())
elif move_to_item:
self.setX(move_to_item.x_value)
elif move_to_end and direction > 0:
self.setX(move_to_end.x_value + move_to_end.rect().width())
self.update_frame()

def paint(self, *args, **kwargs):
new_args = [args[0],
Expand Down