Skip to content

fix(audio_osd): use percent to check volume icon #3169

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

Closed
jeffydc wants to merge 1 commit into from
Closed

fix(audio_osd): use percent to check volume icon #3169

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
8 changes: 4 additions & 4 deletions src/shell/osd/audio_osd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ namespace {

[[nodiscard]] bool volumeChanged(float a, float b) { return std::abs(a - b) > kVolumeChangeEpsilon; }

const char* volumeIconName(float volume, bool muted) {
if (muted || volume <= 0.0f) {
const char* volumeIconName(int percent, bool muted) {
if (muted || percent <= 0) {
return "volume-mute";
}
if (volume < 0.4f) {
if (percent < 40) {
return "volume-low";
}
return "volume-high";
Expand All @@ -29,7 +29,7 @@ namespace {
const int percent = static_cast<int>(std::round(std::max(0.0f, volume) * 100.0f));
return OsdContent{
.kind = OsdKind::Volume,
.icon = volumeIconName(volume, muted),
.icon = volumeIconName(percent, muted),
.value = std::to_string(percent) + "%",
.progress = std::clamp(volume, 0.0f, 1.0f),
.overLimit = percent > 100,
Expand Down
Loading