[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: fix `MainCtx` accession in FlickableScrollHandler

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
5547157b by Fatih Uzunoglu at 2024-08-02T09:00:54+00:00
qml: fix `MainCtx` accession in FlickableScrollHandler

- - - - -
2263f532 by Fatih Uzunoglu at 2024-08-02T09:00:54+00:00
qml: rename `FlickableScrollHandler.qml` to `DefaultFlickableScrollHandler.qml`

Currently, the C++ type `FlickableScrollHandler` conflicts with QML type
with the same name.

- - - - -


8 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml
- modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml
- modules/gui/qt/meson.build
- modules/gui/qt/network/qml/BrowseHomeDisplay.qml
- modules/gui/qt/util/qml/FlickableScrollHandler.qml → modules/gui/qt/util/qml/DefaultFlickableScrollHandler.qml
- modules/gui/qt/widgets/qml/ExpandGridView.qml
- modules/gui/qt/widgets/qml/KeyNavigableListView.qml


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -1122,7 +1122,7 @@ libqml_module_util_a_CXXFLAGS = $(libqt_plugin_la_CXXFLAGS)
 libqml_module_util_a_CPPFLAGS = $(libqt_plugin_la_CPPFLAGS)
 libqml_module_util_a_QML = \
 	util/qml/ModelSortSettingHandler.qml \
-	util/qml/FlickableScrollHandler.qml \
+	util/qml/DefaultFlickableScrollHandler.qml \
 	util/qml/ViewDragAutoScrollHandler.qml \
 	util/qml/FSM.qml \
 	util/qml/FSMState.qml \


=====================================
modules/gui/qt/dialogs/toolbar/qml/EditorDNDView.qml
=====================================
@@ -96,7 +96,7 @@ ListView {
         colorSet: ColorContext.View
     }
 
-    FlickableScrollHandler {
+    DefaultFlickableScrollHandler {
         fallbackScroll: true
         enabled: true
     }


=====================================
modules/gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml
=====================================
@@ -60,7 +60,7 @@ GridView {
         preventStealing: true
     }
 
-    FlickableScrollHandler { }
+    DefaultFlickableScrollHandler { }
 
     DropArea {
         id: dropArea


=====================================
modules/gui/qt/meson.build
=====================================
@@ -783,7 +783,7 @@ qml_modules += {
     'outdir' : 'VLC/Util',
     'sources': files(
         'util/qml/ModelSortSettingHandler.qml',
-        'util/qml/FlickableScrollHandler.qml',
+        'util/qml/DefaultFlickableScrollHandler.qml',
         'util/qml/ViewDragAutoScrollHandler.qml',
         'util/qml/FSM.qml',
         'util/qml/FSMState.qml',


=====================================
modules/gui/qt/network/qml/BrowseHomeDisplay.qml
=====================================
@@ -145,7 +145,7 @@ FocusScope {
         contentWidth: column.width
         contentHeight: column.height
 
-        FlickableScrollHandler { }
+        DefaultFlickableScrollHandler { }
 
         Navigation.parentItem: root
 


=====================================
modules/gui/qt/util/qml/FlickableScrollHandler.qml → modules/gui/qt/util/qml/DefaultFlickableScrollHandler.qml
=====================================
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (C) 2021 VLC authors and VideoLAN
+ * Copyright (C) 2024 VLC authors and VideoLAN
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ import VLC.Util
 FlickableScrollHandler {
     id: handler
 
-    scaleFactor: VLC.MainCtx.intfScaleFactor
+    scaleFactor: MainCtx.intfScaleFactor
 
-    enabled: !VLC.MainCtx.smoothScroll
+    enabled: !MainCtx.smoothScroll
 }


=====================================
modules/gui/qt/widgets/qml/ExpandGridView.qml
=====================================
@@ -795,7 +795,7 @@ FocusScope {
             }
         }
 
-        FlickableScrollHandler { }
+        DefaultFlickableScrollHandler { }
 
         Loader {
             id: headerItemLoader


=====================================
modules/gui/qt/widgets/qml/KeyNavigableListView.qml
=====================================
@@ -285,7 +285,7 @@ ListView {
         }
     }
 
-    FlickableScrollHandler { }
+    DefaultFlickableScrollHandler { }
 
     // FIXME: This is probably not useful anymore.
     Connections {



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fa6bb1cec0dc4942e605486fe7cdb2b3e1cb2c2b...2263f53232c7ec96555bd2409580757de0f97f37

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/fa6bb1cec0dc4942e605486fe7cdb2b3e1cb2c2b...2263f53232c7ec96555bd2409580757de0f97f37
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance