Skip to content

Repaint karaoke split/join bar immediately after changing fonts #394

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −3
Open

Repaint karaoke split/join bar immediately after changing fonts #394

Show file tree
Hide file tree
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
23 changes: 20 additions & 3 deletions src/audio_karaoke.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ AudioKaraoke::AudioKaraoke(wxWindow *parent, agi::Context *c)
main_sizer->Add(split_area, wxSizerFlags(1).Expand());
SetSizerAndFit(main_sizer);

/// @todo subscribe
split_font.SetFaceName(FontFace("Audio/Karaoke"));
split_font.SetPointSize(OPT_GET("Audio/Karaoke/Font Size")->GetInt());
SetStyle();
OPT_SUB("Audio/Karaoke/Font Face", &AudioKaraoke::SetStyle, this);
OPT_SUB("Audio/Karaoke/Font Size", &AudioKaraoke::SetStyle, this);

split_area->Bind(wxEVT_SIZE, &AudioKaraoke::OnSize, this);
split_area->Bind(wxEVT_PAINT, &AudioKaraoke::OnPaint, this);
Expand Down Expand Up @@ -422,3 +422,20 @@ void AudioKaraoke::SetTagType(std::string_view new_tag) {
kara->SetTagType(new_tag);
AcceptSplit();
}

void AudioKaraoke::SetStyle() {
wxString fontname = FontFace("Audio/Karaoke");
if (!fontname.empty()) split_font.SetFaceName(fontname);
split_font.SetPointSize(OPT_GET("Audio/Karaoke/Font Size")->GetInt());

// Clear cached character metrics since font changed
char_widths.clear();
char_height = 0;
char_width = 0;

// Recalculate layout with new font
if (enabled && active_line) {
SetDisplayText();
split_area->Refresh(false);
}
}
2 changes: 2 additions & 0 deletions src/audio_karaoke.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ class AudioKaraoke final : public wxWindow {
void OnScrollTimer();
void OnScrollTimer(wxTimerEvent& event);

void SetStyle();

public:
/// Constructor
/// @param parent Parent window
Expand Down
Loading