Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
427
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
705f53e9
Commit
705f53e9
authored
1 year ago
by
Pierre Lamot
Committed by
Jean-Baptiste Kempf
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
qml: fix race condition while initializing FlickableScrollHandler
fix:
#27890
parent
71c6ce8d
No related branches found
No related tags found
1 merge request
!3345
qml: fix race condition while initializing FlickableScrollHandler
Pipeline
#318884
passed with stage
in 18 minutes and 13 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gui/qt/util/flickable_scroll_handler.cpp
+5
-3
5 additions, 3 deletions
modules/gui/qt/util/flickable_scroll_handler.cpp
modules/gui/qt/util/flickable_scroll_handler.hpp
+7
-3
7 additions, 3 deletions
modules/gui/qt/util/flickable_scroll_handler.hpp
with
12 additions
and
6 deletions
modules/gui/qt/util/flickable_scroll_handler.cpp
+
5
−
3
View file @
705f53e9
...
...
@@ -34,8 +34,6 @@ FlickableScrollHandler::FlickableScrollHandler(QObject *parent)
});
setScaleFactor
(
1.0
);
QMetaObject
::
invokeMethod
(
this
,
&
FlickableScrollHandler
::
init
,
Qt
::
QueuedConnection
);
}
FlickableScrollHandler
::~
FlickableScrollHandler
()
...
...
@@ -43,7 +41,11 @@ FlickableScrollHandler::~FlickableScrollHandler()
detach
();
}
void
FlickableScrollHandler
::
init
()
void
FlickableScrollHandler
::
classBegin
()
{
}
void
FlickableScrollHandler
::
componentComplete
()
{
assert
(
parent
());
...
...
This diff is collapsed.
Click to expand it.
modules/gui/qt/util/flickable_scroll_handler.hpp
+
7
−
3
View file @
705f53e9
...
...
@@ -22,8 +22,9 @@
#include
<QQmlProperty>
#include
<QPointer>
#include
<QQuickItem>
#include
<QQmlParserStatus>
class
FlickableScrollHandler
:
public
QObject
class
FlickableScrollHandler
:
public
QObject
,
public
QQmlParserStatus
{
Q_OBJECT
...
...
@@ -35,6 +36,8 @@ class FlickableScrollHandler : public QObject
Q_PROPERTY
(
bool
fallbackScroll
MEMBER
m_fallbackScroll
NOTIFY
fallbackScrollChanged
FINAL
)
Q_PROPERTY
(
bool
handleOnlyPixelDelta
MEMBER
m_handleOnlyPixelDelta
NOTIFY
handleOnlyPixelDeltaChanged
FINAL
)
Q_INTERFACES
(
QQmlParserStatus
)
public:
explicit
FlickableScrollHandler
(
QObject
*
parent
=
nullptr
);
~
FlickableScrollHandler
();
...
...
@@ -46,6 +49,9 @@ public:
void
setScaleFactor
(
qreal
newScaleFactor
);
void
setEnabled
(
bool
newEnabled
);
void
classBegin
()
override
;
void
componentComplete
()
override
;
signals:
void
initialized
();
...
...
@@ -57,8 +63,6 @@ signals:
void
handleOnlyPixelDeltaChanged
();
private
slots
:
void
init
();
void
adjustScrollBarV
();
void
adjustScrollBarH
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment