Skip to content

Support Timer text metrics on Legacy Qt 5.9 (Bionic build server) #1091

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

Merged
jonoomph merged 1 commit into from
Aug 31, 2026
Merged

Support Timer text metrics on Legacy Qt 5.9 (Bionic build server) #1091

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
13 changes: 11 additions & 2 deletions src/effects/Timer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ namespace {
return GRAVITY_BOTTOM;
return gravity;
}

double TextAdvance(const QFontMetricsF& metrics, const QString& text)
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
return metrics.horizontalAdvance(text);
#else
return metrics.width(text);
#endif
}
}

Timer::Timer() :
Expand Down Expand Up @@ -288,7 +297,7 @@ std::shared_ptr<openshot::Frame> Timer::GetFrame(std::shared_ptr<openshot::Frame
const double text_height = std::max(1.0, text_bounds.height());
double digit_slot_width = 0.0;
for (int digit = 0; digit <= 9; ++digit)
digit_slot_width = std::max(digit_slot_width, metrics.horizontalAdvance(QString::number(digit)));
digit_slot_width = std::max(digit_slot_width, TextAdvance(metrics, QString::number(digit)));

const bool use_slot_layout = timer_text.size() == layout_text.size() &&
!(mode == TIMER_MODE_FRAME_NUMBER || format == TIMER_FORMAT_FRAMES);
Expand All @@ -298,7 +307,7 @@ std::shared_ptr<openshot::Frame> Timer::GetFrame(std::shared_ptr<openshot::Frame
slot_widths.reserve(layout_text.size());
for (int index = 0; index < layout_text.size(); ++index) {
const QString layout_char(layout_text[index]);
const double slot_width = layout_text[index].isDigit() ? digit_slot_width : metrics.horizontalAdvance(layout_char);
const double slot_width = layout_text[index].isDigit() ? digit_slot_width : TextAdvance(metrics, layout_char);
slot_widths.push_back(slot_width);
layout_width += slot_width;
}
Expand Down
Loading