[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: forward baseline offset in `ResumeDialog`

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
7a9171b7 by Fatih Uzunoglu at 2026-01-02T11:29:59+01:00
qml: forward baseline offset in `ResumeDialog`

- - - - -
455de7d1 by Fatih Uzunoglu at 2026-01-02T11:29:59+01:00
qml: make implicit height more stable in `TopBar`

This fixes video window gets resized when the resume dialog closes,
even if it has only one line of text showing.

- - - - -


2 changed files:

- modules/gui/qt/player/qml/ResumeDialog.qml
- modules/gui/qt/player/qml/TopBar.qml


Changes:

=====================================
modules/gui/qt/player/qml/ResumeDialog.qml
=====================================
@@ -35,6 +35,8 @@ FocusScope {
     implicitHeight: continueBtn.y + continueBtn.implicitHeight
     implicitWidth: maxWidth
 
+    baselineOffset: label.baselineOffset
+
     visible: false
     enabled: visible
 


=====================================
modules/gui/qt/player/qml/TopBar.qml
=====================================
@@ -241,9 +241,14 @@ FocusScope{
                                      : logoGroup.implicitWidth
 
         implicitHeight: {
-            if (root.resumeVisible)
-                return resumeDialog.implicitHeight
-            else if (_showTopBar)
+            if (root.resumeVisible) {
+                // Only if there are multiple lines use `resumeDialog`'s implicit height, otherwise the video
+                // window may get resized by few pixels unnecessarily when `resumeDialog` is no longer visible.
+                if (resumeDialog.implicitHeight >= (logoGroup.implicitHeight + resumeDialog.baselineOffset))
+                    return resumeDialog.implicitHeight
+                else
+                    return logoGroup.implicitHeight
+            } else if (_showTopBar)
                 return logoGroup.implicitHeight
             else
                 return 0



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/69b4984662cd5388684772bc0e411aea00bf29d5...455de7d18bf4ab0424e6802892256a567f856c01

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/69b4984662cd5388684772bc0e411aea00bf29d5...455de7d18bf4ab0424e6802892256a567f856c01
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance