Changes of Revision 450

vlc-beta.patch Changed
x
 
1
@@ -57,59 +57,6 @@
2
  }
3
  
4
  #else // _WIN32
5
---- a/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
6
-+++ b/modules/gui/qt/maininterface/compositor_x11_uisurface.cpp
7
-@@ -74,8 +74,6 @@ CompositorX11UISurface::CompositorX11UISurface(QWindow* window, QScreen* screen)
8
-         m_backingStorePainter->setCompositionMode(QPainter::CompositionMode_Source);
9
-     }
10
- 
11
--    m_renderWindow->installEventFilter(this);
12
--
13
-     m_uiRenderControl = new CompositorX11RenderControl(window);
14
- 
15
-     m_uiWindow = new CompositorOffscreenWindow(m_uiRenderControl);
16
-@@ -87,6 +85,8 @@ CompositorX11UISurface::CompositorX11UISurface(QWindow* window, QScreen* screen)
17
-     if (!m_qmlEngine->incubationController())
18
-         m_qmlEngine->setIncubationController(m_uiWindow->incubationController());
19
- 
20
-+    m_renderWindow->installEventFilter(this);
21
-+
22
-     if (m_context)
23
-     {
24
-         connect(m_uiWindow, &QQuickWindow::sceneGraphInitialized, this, this() {
25
-@@ -151,11 +151,12 @@ CompositorX11UISurface::~CompositorX11UISurface()
26
- 
27
- void CompositorX11UISurface::setContent(QQmlComponent*,  QQuickItem* rootItem)
28
- {
29
-+    assert(rootItem);
30
-     m_rootItem = rootItem;
31
- 
32
-     m_rootItem->setParentItem(m_uiWindow->contentItem());
33
- 
34
--    updateSizes();
35
-+    m_rootItem->setSize(size());
36
- 
37
-     m_rootItem->forceActiveFocus();
38
- 
39
-@@ -270,6 +271,8 @@ bool CompositorX11UISurface::render()
40
- 
41
- void CompositorX11UISurface::updateSizes()
42
- {
43
-+    assert(m_uiWindow);
44
-+
45
-     qreal dpr = devicePixelRatio();
46
-     QSize windowSize = size();
47
- 
48
-@@ -279,7 +282,8 @@ void CompositorX11UISurface::updateSizes()
49
-         m_backingStore->resize(m_onscreenSize);
50
- 
51
-     // Behave like SizeRootObjectToView.
52
--    m_rootItem->setSize(windowSize);
53
-+    if (m_rootItem)
54
-+        m_rootItem->setSize(windowSize);
55
-     m_uiWindow->resize(windowSize);
56
- }
57
- 
58
 --- a/src/Makefile.am
59
 +++ b/src/Makefile.am
60
 @@ -585,7 +585,7 @@ libvlccore_la_LDFLAGS = \
61
_service:obs_scm:vlc-beta-20250328.258722d74c.obscpio Deleted
_service:obs_scm:vlc-beta-20250330.3b4b8809a0.obscpio Added
_service:obs_scm:vlc-beta.obsinfo Changed
9
 
1
@@ -1,4 +1,4 @@
2
 name: vlc-beta
3
-version: 20250328.258722d74c
4
-mtime: 1743147607
5
-commit: 258722d74cba782abe5d7a714ccf0516df639984
6
+version: 20250330.3b4b8809a0
7
+mtime: 1743345080
8
+commit: 3b4b8809a0c9301cea4d7a0cc863d7850e077910
9