Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions data/high-tide.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<file preprocess="xml-stripblanks">icons/16x16/actions/view-list-ordered-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/missing-lyrics-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/share-alt-symbolic.svg</file>
<file preprocess="xml-stripblanks">icons/16x16/actions/object-flip-vertical-symbolic.svg</file>
</gresource>
</gresources>

4 changes: 4 additions & 0 deletions data/icons/16x16/actions/object-flip-vertical-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 27 additions & 12 deletions data/ui/widgets/lyrics_widget.blp
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,33 @@ template $HTLyricsWidget: Box {
title: _("Lyrics");
name: "lyrics_page";

child: ScrolledWindow {
hscrollbar-policy: never;
ListView list_view {
vexpand: true;
overflow: visible;
margin-bottom: 12;

styles [
"lyrics-widget",
]
}
child: Overlay {
child: ScrolledWindow {
ListView list_view {
vexpand: true;
overflow: visible;
margin-bottom: 12;

styles [
"lyrics-widget",
]
}
};

[overlay]
Button sync_button {
label: _("Your Button Label");
icon-name: "object-flip-vertical-symbolic";
halign: end;
valign: end;
margin-end: 12;
margin-bottom: 12;

styles [
"card-bg"
]
}
};
}
}
}
}
39 changes: 33 additions & 6 deletions src/widgets/lyrics_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class HTLyricsWidget(Gtk.Box, IDisconnectable):

list_view = Gtk.Template.Child()
stack = Gtk.Template.Child()
sync_button = Gtk.Template.Child()

has_timestamps = False

Expand All @@ -88,7 +89,10 @@ def __init__(self, _item=None):
self.list_view.set_factory(self.factory)

self.adjustment = self.list_view.get_vadjustment()
self.adjustment.connect("value-changed", self._on_scroll)

self.sync_button.connect("clicked", self._on_sync_button_click)

self.prev_index = 0
self.prev_value = 0

Expand All @@ -100,6 +104,8 @@ def set_lyrics(self, lyrics_text: str):
"""
self.stack.set_visible_child_name("lyrics_page")
self.list_store.remove_all()
self.autoscroll_enabled = True
self.scroll_error_count = 0

lines = lyrics_text.splitlines()
timestamp_pattern = re.compile(r"\[(\d+):(\d+\.\d+)\](.*)")
Expand Down Expand Up @@ -163,9 +169,7 @@ def set_time(self, time_seconds: float):
else:
break
if self.get_mapped():
if self.prev_index == new_index:
target_position = self.prev_value
elif new_index == 0:
if new_index == 0:
target_position = 0
else:
view_height = self.adjustment.get_page_size()
Expand All @@ -176,22 +180,45 @@ def set_time(self, time_seconds: float):

target_position = max(0, min(target_position, max_height - view_height))

self._scroll_to(target_position)
if self.autoscroll_enabled:
self.scroll_error_count = 0
self._scroll_to(target_position)

if self.has_timestamps and self.handler_id:
self.selection_model.handler_block(self.handler_id)
self.selection_model.select_item(new_index, True)
self.selection_model.handler_unblock(self.handler_id)

def _scroll_to(self, value):
self.animation_is_playing = True
target = Adw.PropertyAnimationTarget.new(self.adjustment, "value")
animation = Adw.TimedAnimation.new(
self.scroll_animation = Adw.TimedAnimation.new(
self, self.adjustment.get_value(), value, 200, target
)
animation.play()
self.scrolled_window = self.list_view.get_ancestor(Gtk.ScrolledWindow)
self.scrolled_window.set_kinetic_scrolling(False)
self.scroll_animation.play()
self.scrolled_window.set_kinetic_scrolling(True)

self.prev_value = value

def _on_sync_button_click(self, clicked):
if clicked:
self.autoscroll_enabled = True
self.scroll_error_count = 0
self.sync_button.set_visible(False)

def _on_scroll(self, scrolling):
if self.animation_is_playing:
if self.scroll_animation.get_state() == 3:
self.animation_is_playing = False
elif self.scroll_error_count > 1:
self.autoscroll_enabled = False
self.sync_button.set_visible(True)
else:
self.scroll_error_count += 1


def _on_selection_changed(self, selection_model, position, n_items):
if not self.has_timestamps:
return
Expand Down