Changeset 149942 in webkit

Timestamp:

May 11, 2013 2:42:44 PM (11 years ago)

Author:

Antoine Quint

Message:

[Mac] The captions menu should not use a canned max-width and max-height
​https://bugs.webkit.org/show_bug.cgi?id=115968

Reviewed by Eric Carlson.

Use more real estate to display the captions menu should the caption names
be long.

• css/mediaControlsQuickTime.css:

(video::-webkit-media-controls-closed-captions-container):
(video::-webkit-media-controls-closed-captions-track-list):
Make the captions menu scale to a max-width and max-height to allow 4px
above and below the menu, except on the right where it always aligns with
the captions icon in the media controller.

• html/shadow/MediaControlsApple.cpp:

(WebCore::MediaControlsApple::createControls):
Move the captions menu element to be a child of the controls instead of
the panel such that it may scale relative to the controls when using %
CSS values.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/mediaControlsQuickTime.css (modified) (2 diffs)
• html/shadow/MediaControlsApple.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-11  Antoine Quint  <graouts@apple.com>
+
+        [Mac] The captions menu should not use a canned max-width and max-height
+        https://bugs.webkit.org/show_bug.cgi?id=115968
+
+        Reviewed by Eric Carlson.
+
+        Use more real estate to display the captions menu should the caption names
+        be long.
+
+        * css/mediaControlsQuickTime.css:
+        (video::-webkit-media-controls-closed-captions-container):
+        (video::-webkit-media-controls-closed-captions-track-list):
+        Make the captions menu scale to a max-width and max-height to allow 4px
+        above and below the menu, except on the right where it always aligns with
+        the captions icon in the media controller.
+        * html/shadow/MediaControlsApple.cpp:
+        (WebCore::MediaControlsApple::createControls):
+        Move the captions menu element to be a child of the controls instead of
+        the panel such that it may scale relative to the controls when using %
+        CSS values.
+
 2013-05-11  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebCore/css/mediaControlsQuickTime.css

@@ -253 +253 @@
     right: 38px;
     bottom: 29px;
+    max-width: -webkit-calc(100% - 48px); /* right + 10px */
+    max-height: -webkit-calc(100% - 39px); /* bottom + 10px */
+    overflow-x: hidden;
+    overflow-y: scroll;
     background-color: rgba(0, 0, 0, 0.85);
     border: 3px solid rgba(128, 128, 128, 0.75);
@@ -262 +266 @@
 video::-webkit-media-controls-closed-captions-track-list {
     display: block;
-    max-width: 250px;
-    max-height: 250px;
-    overflow-x: hidden;
-    overflow-y: scroll;
     text-align: left;
     font-family: "Helvetica Bold", Helvetica;

trunk/Source/WebCore/html/shadow/MediaControlsApple.cpp

@@ -164 +164 @@
 
         controls->m_closedCaptionsContainer = closedCaptionsContainer.get();
-        panel->appendChild(closedCaptionsContainer.release(), ec, AttachLazily);
+        controls->appendChild(closedCaptionsContainer.release(), ec, AttachLazily);
         if (ec)
             return 0;