Fix to make video seeking bar show the correct time

We should also considering the padding after we got the seekBar view bound Signed-off-by: Songlin Jiang <sjiang@igalia.com>
Igalia · Sep 27, 2023 · 6f6be2b · 6f6be2b
1 parent 69499f3
commit 6f6be2b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/views/MediaSeekBar.java b/app/src/common/shared/com/igalia/wolvic/ui/views/MediaSeekBar.java
@@ -14,6 +14,7 @@
 import androidx.annotation.Nullable;
 
 import com.igalia.wolvic.R;
+import com.igalia.wolvic.ui.widgets.WidgetPlacement;
 
 public class MediaSeekBar extends LinearLayout implements SeekBar.OnSeekBarChangeListener {
     private SeekBar mSeekBar;
@@ -83,8 +84,9 @@ private void initialize() {
                 notify = true;
             }
 
+            final int padding = WidgetPlacement.dpDimension(getContext(), R.dimen.media_controls_seek_bar_padding);
             if (notify) {
-                final float ratio = event.getX() / view.getWidth();
+                final float ratio = (event.getX() - padding) / (view.getWidth() - 2 * padding);
                 notifySeekPreview(mDuration * ratio);
             }
 

diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/MediaControlsWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/MediaControlsWidget.java
@@ -165,14 +165,23 @@ public void onSeekHoverEnd() {
 
             @Override
             public void onSeekPreview(String aText, double aRatio) {
+                final int padding = WidgetPlacement.dpDimension(getContext(), R.dimen.media_controls_seek_bar_padding);
                 mBinding.mediaControlSeekLabel.setText(aText);
                 View childView = mBinding.mediaControlSeekBar.getSeekBarView();
                 childView.getDrawingRect(mOffsetViewBounds);
                 MediaControlsWidget.this.offsetDescendantRectToMyCoords(childView, mOffsetViewBounds);
 
                 FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mBinding.mediaControlSeekLabel.getLayoutParams();
-                params.setMarginStart(mOffsetViewBounds.left + (int) (aRatio * mOffsetViewBounds.width()) - mBinding.mediaControlSeekLabel.getMeasuredWidth() / 2);
+                params.setMarginStart(mOffsetViewBounds.left + padding +
+                        (int) (aRatio * (mOffsetViewBounds.width() - 2 * padding)) -
+                        mBinding.mediaControlSeekLabel.getMeasuredWidth() / 2);
                 mBinding.mediaControlSeekLabel.setLayoutParams(params);
+
+                if (aRatio < 0 || aRatio > 1) {
+                    mBinding.mediaControlSeekLabel.setVisibility(View.GONE);
+                } else {
+                    mBinding.mediaControlSeekLabel.setVisibility(View.VISIBLE);
+                }
             }
         });
 

diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
@@ -94,6 +94,7 @@
     <dimen name="media_controls_panel_width">284dp</dimen>
     <dimen name="media_controls_panel_height">85dp</dimen>
     <dimen name="media_controls_rounded_corners">15dp</dimen>
+    <dimen name="media_controls_seek_bar_padding">30dp</dimen>
     <dimen name="media_controls_world_z" format="float" type="dimen">2.5</dimen>
 
     <!-- Top Bar -->