Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[GTK] close the volume slider when the media control panel is hidden
https://bugs.webkit.org/show_bug.cgi?id=119062

Patch by Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> on 2013-08-13
Reviewed by Gustavo Noronha Silva.

It's not obvious how to close the volume slider on webkitGtk.
The volume slider should close if the control panel is hidden.

* html/shadow/MediaControlsGtk.cpp:
(WebCore::MediaControlsGtk::makeTransparent):
* html/shadow/MediaControlsGtk.h:

Canonical link: https://commits.webkit.org/137689@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Danilo Cesar Lemes de Paula authored and webkit-commit-queue committed Aug 13, 2013
1 parent be803e7 commit 9f82ad3
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 0 deletions.
14 changes: 14 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
2013-08-13 Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>

[GTK] close the volume slider when the media control panel is hidden
https://bugs.webkit.org/show_bug.cgi?id=119062

Reviewed by Gustavo Noronha Silva.

It's not obvious how to close the volume slider on webkitGtk.
The volume slider should close if the control panel is hidden.

* html/shadow/MediaControlsGtk.cpp:
(WebCore::MediaControlsGtk::makeTransparent):
* html/shadow/MediaControlsGtk.h:

2013-08-13 Commit Queue <commit-queue@webkit.org>

Unreviewed, rolling out r152563.
Expand Down
9 changes: 9 additions & 0 deletions Source/WebCore/html/shadow/MediaControlsGtk.cpp
Expand Up @@ -201,6 +201,15 @@ void MediaControlsGtk::changedMute()
m_volumeSlider->setVolume(m_mediaController->volume());
}


void MediaControlsGtk::makeTransparent()
{
MediaControls::makeTransparent();

if (m_volumeSliderContainer)
m_volumeSliderContainer->hide();
}

void MediaControlsGtk::showVolumeSlider()
{
if (!m_mediaController->hasAudio())
Expand Down
1 change: 1 addition & 0 deletions Source/WebCore/html/shadow/MediaControlsGtk.h
Expand Up @@ -46,6 +46,7 @@ class MediaControlsGtk : public MediaControls {
void changedMute() OVERRIDE;
virtual void updateCurrentTimeDisplay() OVERRIDE;
virtual void showVolumeSlider() OVERRIDE;
virtual void makeTransparent() OVERRIDE;

#if ENABLE(VIDEO_TRACK)
void createTextTrackDisplay() OVERRIDE;
Expand Down

0 comments on commit 9f82ad3

Please sign in to comment.