RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:27:43 +00:00
Code Issues Activity Actions

LibWeb: Move the media volume slider 1:1 with the mouse cursor

Browse source 
The volume control's slider is drawn in a rectangle shrunken by its
slider handle's size, so the handle did not move 1:1 with the user's
mouse movement.

To fix this, it will now check for a mousedown in the volume control
with a rectangle sized to fit any possible position of the handle, but
the volume value result will be calculated based on the center of the
handle instead. This allows it to move 1:1 with the mouse cursor.

Co-authored-by: trflynn89 <trflynn89@serenityos.org>
This commit is contained in:
Zaggy1024 2023-08-03 17:53:35 -05:00 • committed by Tim Flynn
parent 3d19eebba0
commit 74636ccb57
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibWeb/HTML/HTMLMediaElement.h
View file

@ -124,6 +124,7 @@ public:
Optional<CSSPixelRect> timeline_rect; Optional<CSSPixelRect> timeline_rect;
Optional<CSSPixelRect> speaker_button_rect; Optional<CSSPixelRect> speaker_button_rect;
Optional<CSSPixelRect> volume_rect; Optional<CSSPixelRect> volume_rect;
Optional<CSSPixelRect> volume_scrub_rect;
}; };
CachedLayoutBoxes& cached_layout_boxes(Badge<Painting::MediaPaintable>) const { return m_layout_boxes; } CachedLayoutBoxes& cached_layout_boxes(Badge<Painting::MediaPaintable>) const { return m_layout_boxes; }

22
Userland/Libraries/LibWeb/Painting/MediaPaintable.cpp
View file

@ -102,6 +102,8 @@ MediaPaintable::Components MediaPaintable::compute_control_bar_components(PaintC
components.volume_rect = remaining_rect; components.volume_rect = remaining_rect;
components.volume_rect.take_from_left(remaining_rect.width() - volume_width); components.volume_rect.take_from_left(remaining_rect.width() - volume_width);
remaining_rect.take_from_right(volume_width); remaining_rect.take_from_right(volume_width);
components.volume_scrub_rect = components.volume_rect.shrunken(components.volume_button_size, components.volume_rect.height() - components.volume_button_size / 2);
} }
components.speaker_button_rect = remaining_rect; components.speaker_button_rect = remaining_rect;
@ -126,6 +128,7 @@ MediaPaintable::Components MediaPaintable::compute_control_bar_components(PaintC
media_element.cached_layout_boxes({}).timeline_rect = context.scale_to_css_rect(components.timeline_rect); media_element.cached_layout_boxes({}).timeline_rect = context.scale_to_css_rect(components.timeline_rect);
media_element.cached_layout_boxes({}).speaker_button_rect = context.scale_to_css_rect(components.speaker_button_rect); media_element.cached_layout_boxes({}).speaker_button_rect = context.scale_to_css_rect(components.speaker_button_rect);
media_element.cached_layout_boxes({}).volume_rect = context.scale_to_css_rect(components.volume_rect); media_element.cached_layout_boxes({}).volume_rect = context.scale_to_css_rect(components.volume_rect);
media_element.cached_layout_boxes({}).volume_scrub_rect = context.scale_to_css_rect(components.volume_scrub_rect);
return components; return components;
} }
@ -241,25 +244,22 @@ void MediaPaintable::paint_control_bar_volume(PaintContext& context, HTML::HTMLM
if (components.volume_rect.is_empty()) if (components.volume_rect.is_empty())
return; return;
auto volume_scrub_rect = components.volume_rect; auto volume_position = static_cast<double>(static_cast<int>(components.volume_scrub_rect.width())) * media_element.volume();
volume_scrub_rect.shrink(components.volume_button_size, volume_scrub_rect.height() - components.volume_button_size / 2);
auto volume_position = static_cast<double>(static_cast<int>(volume_scrub_rect.width())) * media_element.volume();
auto volume_button_offset_x = static_cast<DevicePixels>(round(volume_position)); auto volume_button_offset_x = static_cast<DevicePixels>(round(volume_position));
Gfx::AntiAliasingPainter painter { context.painter() }; Gfx::AntiAliasingPainter painter { context.painter() };
auto volume_lower_rect = volume_scrub_rect; auto volume_lower_rect = components.volume_scrub_rect;
volume_lower_rect.set_width(volume_button_offset_x); volume_lower_rect.set_width(volume_button_offset_x);
painter.fill_rect_with_rounded_corners(volume_lower_rect.to_type<int>(), control_highlight_color.lightened(), 4); painter.fill_rect_with_rounded_corners(volume_lower_rect.to_type<int>(), control_highlight_color.lightened(), 4);
auto volume_higher_rect = volume_scrub_rect; auto volume_higher_rect = components.volume_scrub_rect;
volume_higher_rect.take_from_left(volume_button_offset_x); volume_higher_rect.take_from_left(volume_button_offset_x);
painter.fill_rect_with_rounded_corners(volume_higher_rect.to_type<int>(), Color::Black, 4); painter.fill_rect_with_rounded_corners(volume_higher_rect.to_type<int>(), Color::Black, 4);
auto volume_button_rect = volume_scrub_rect; auto volume_button_rect = components.volume_scrub_rect;
volume_button_rect.shrink(volume_scrub_rect.width() - components.volume_button_size, volume_scrub_rect.height() - components.volume_button_size); volume_button_rect.shrink(components.volume_scrub_rect.width() - components.volume_button_size, components.volume_scrub_rect.height() - components.volume_button_size);
volume_button_rect.set_x(volume_scrub_rect.x() + volume_button_offset_x - components.volume_button_size / 2); volume_button_rect.set_x(components.volume_scrub_rect.x() + volume_button_offset_x - components.volume_button_size / 2);
auto volume_is_hovered = rect_is_hovered(media_element, components.volume_rect, mouse_position, HTML::HTMLMediaElement::MouseTrackingComponent::Volume); auto volume_is_hovered = rect_is_hovered(media_element, components.volume_rect, mouse_position, HTML::HTMLMediaElement::MouseTrackingComponent::Volume);
auto volume_color = control_button_color(volume_is_hovered); auto volume_color = control_button_color(volume_is_hovered);
@ -279,7 +279,7 @@ MediaPaintable::DispatchEventOfSameName MediaPaintable::handle_mousedown(Badge<E
set_current_time(media_element, *cached_layout_boxes.timeline_rect, position, Temporary::Yes); set_current_time(media_element, *cached_layout_boxes.timeline_rect, position, Temporary::Yes);
} else if (cached_layout_boxes.volume_rect.has_value() && cached_layout_boxes.volume_rect->contains(position)) { } else if (cached_layout_boxes.volume_rect.has_value() && cached_layout_boxes.volume_rect->contains(position)) {
media_element.set_layout_mouse_tracking_component({}, HTML::HTMLMediaElement::MouseTrackingComponent::Volume); media_element.set_layout_mouse_tracking_component({}, HTML::HTMLMediaElement::MouseTrackingComponent::Volume);
set_volume(media_element, *cached_layout_boxes.volume_rect, position); set_volume(media_element, *cached_layout_boxes.volume_scrub_rect, position);
} }
if (media_element.layout_mouse_tracking_component({}).has_value()) if (media_element.layout_mouse_tracking_component({}).has_value())
@ -348,7 +348,7 @@ MediaPaintable::DispatchEventOfSameName MediaPaintable::handle_mousemove(Badge<E
case HTML::HTMLMediaElement::MouseTrackingComponent::Volume: case HTML::HTMLMediaElement::MouseTrackingComponent::Volume:
if (cached_layout_boxes.volume_rect.has_value()) { if (cached_layout_boxes.volume_rect.has_value()) {
set_volume(media_element, *cached_layout_boxes.volume_rect, position); set_volume(media_element, *cached_layout_boxes.volume_scrub_rect, position);
if (auto* page = browsing_context().page()) { if (auto* page = browsing_context().page()) {
auto volume = static_cast<u8>(media_element.volume() * 100.0); auto volume = static_cast<u8>(media_element.volume() * 100.0);

1
Userland/Libraries/LibWeb/Painting/MediaPaintable.h
View file

@ -38,6 +38,7 @@ private:
DevicePixels speaker_button_size; DevicePixels speaker_button_size;
DevicePixelRect volume_rect; DevicePixelRect volume_rect;
DevicePixelRect volume_scrub_rect;
DevicePixels volume_button_size; DevicePixels volume_button_size;
}; };