Skip to content

Volume widget fixes #286

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 2 commits into
base: master
Choose a base branch
from
Open

Volume widget fixes #286

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4b209f
volume: Fix hesitating motion in popover on scroll wheel events
soreau Jan 11, 2025
ebd0a4b
volume: Hide volume popover after scroll event
soreau Jan 12, 2025
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
18 changes: 9 additions & 9 deletions src/panel/widgets/volume.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ WayfireVolumeScale::WayfireVolumeScale()
value_changed.block();
this->set_value(this->current_volume);
value_changed.unblock();
this->queue_draw();
}
}, true);

Expand Down Expand Up @@ -104,11 +105,6 @@ bool WayfireVolume::on_popover_timeout(int timer)
void WayfireVolume::check_set_popover_timeout()
{
popover_timeout.disconnect();
if (this->button->is_popover_focused())
{
return;
}

popover_timeout = Glib::signal_timeout().connect(sigc::bind(sigc::mem_fun(*this,
&WayfireVolume::on_popover_timeout), 0), timeout * 1000);
}
Expand All @@ -122,10 +118,15 @@ void WayfireVolume::set_volume(pa_volume_t volume, set_volume_flags_t flags)
gvc_mixer_stream_push_volume(gvc_stream);
}

if ((flags & VOLUME_FLAG_SHOW_POPOVER) &&
!button->get_popover()->is_visible())
if (flags & VOLUME_FLAG_SHOW_POPOVER)
{
button->get_popover()->popup();
if (!button->get_popover()->is_visible())
{
button->get_popover()->popup();
} else
{
check_set_popover_timeout();
}
}

update_icon();
Expand All @@ -137,7 +138,6 @@ void WayfireVolume::on_volume_scroll(GdkEventScroll *event)
0.0, max_norm));

button->grab_focus();
check_set_popover_timeout();
}

void WayfireVolume::on_volume_button_press(GdkEventButton *event)
Expand Down
Loading