File tree Expand file tree Collapse file tree 1 file changed +8
-9
lines changed Expand file tree Collapse file tree 1 file changed +8
-9
lines changed Original file line number Diff line number Diff line change @@ -105,11 +105,6 @@ bool WayfireVolume::on_popover_timeout(int timer)
105
105
void WayfireVolume::check_set_popover_timeout ()
106
106
{
107
107
popover_timeout.disconnect ();
108
- if (this ->button ->is_popover_focused ())
109
- {
110
- return ;
111
- }
112
-
113
108
popover_timeout = Glib::signal_timeout ().connect (sigc::bind (sigc::mem_fun (*this ,
114
109
&WayfireVolume::on_popover_timeout), 0 ), timeout * 1000 );
115
110
}
@@ -123,10 +118,15 @@ void WayfireVolume::set_volume(pa_volume_t volume, set_volume_flags_t flags)
123
118
gvc_mixer_stream_push_volume (gvc_stream);
124
119
}
125
120
126
- if ((flags & VOLUME_FLAG_SHOW_POPOVER) &&
127
- !button->get_popover ()->is_visible ())
121
+ if (flags & VOLUME_FLAG_SHOW_POPOVER)
128
122
{
129
- button->get_popover ()->popup ();
123
+ if (!button->get_popover ()->is_visible ())
124
+ {
125
+ button->get_popover ()->popup ();
126
+ } else
127
+ {
128
+ check_set_popover_timeout ();
129
+ }
130
130
}
131
131
132
132
update_icon ();
@@ -138,7 +138,6 @@ void WayfireVolume::on_volume_scroll(GdkEventScroll *event)
138
138
0.0 , max_norm));
139
139
140
140
button->grab_focus ();
141
- check_set_popover_timeout ();
142
141
}
143
142
144
143
void WayfireVolume::on_volume_button_press (GdkEventButton *event)
You can’t perform that action at this time.
0 commit comments