Title: [154000] trunk/Source/WebCore
- Revision
- 154000
- Author
- [email protected]
- Date
- 2013-08-13 06:14:39 -0700 (Tue, 13 Aug 2013)
Log Message
[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 <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153999 => 154000)
--- trunk/Source/WebCore/ChangeLog 2013-08-13 12:18:02 UTC (rev 153999)
+++ trunk/Source/WebCore/ChangeLog 2013-08-13 13:14:39 UTC (rev 154000)
@@ -1,3 +1,17 @@
+2013-08-13 Danilo Cesar Lemes de Paula <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r152563.
Modified: trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp (153999 => 154000)
--- trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp 2013-08-13 12:18:02 UTC (rev 153999)
+++ trunk/Source/WebCore/html/shadow/MediaControlsGtk.cpp 2013-08-13 13:14:39 UTC (rev 154000)
@@ -201,6 +201,15 @@
m_volumeSlider->setVolume(m_mediaController->volume());
}
+
+void MediaControlsGtk::makeTransparent()
+{
+ MediaControls::makeTransparent();
+
+ if (m_volumeSliderContainer)
+ m_volumeSliderContainer->hide();
+}
+
void MediaControlsGtk::showVolumeSlider()
{
if (!m_mediaController->hasAudio())
Modified: trunk/Source/WebCore/html/shadow/MediaControlsGtk.h (153999 => 154000)
--- trunk/Source/WebCore/html/shadow/MediaControlsGtk.h 2013-08-13 12:18:02 UTC (rev 153999)
+++ trunk/Source/WebCore/html/shadow/MediaControlsGtk.h 2013-08-13 13:14:39 UTC (rev 154000)
@@ -46,6 +46,7 @@
void changedMute() OVERRIDE;
virtual void updateCurrentTimeDisplay() OVERRIDE;
virtual void showVolumeSlider() OVERRIDE;
+ virtual void makeTransparent() OVERRIDE;
#if ENABLE(VIDEO_TRACK)
void createTextTrackDisplay() OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes