Browse Source

Setting QT_QUICK_FLICKABLE_WHEEL_DECELERATION only while opening cura application

CURA-11468
saumya.jain 1 year ago
parent
commit
b7970dadee
4 changed files with 4 additions and 8 deletions
  1. 0 1
      conanfile.py
  2. 4 5
      cura_app.py
  3. 0 1
      packaging/AppImage-builder/AppImageBuilder.yml.jinja
  4. 0 1
      packaging/AppImage/AppRun

+ 0 - 1
conanfile.py

@@ -71,7 +71,6 @@ class CuraConan(ConanFile):
         self._cura_env = Environment()
         self._cura_env.define("QML2_IMPORT_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "qml")))
         self._cura_env.define("QT_PLUGIN_PATH", str(self._site_packages.joinpath("PyQt6", "Qt6", "plugins")))
-        self._cura_env.define("QT_QUICK_FLICKABLE_WHEEL_DECELERATION", "5000")
         if not self.in_local_cache:
             self._cura_env.define("CURA_DATA_ROOT", str(self._share_dir.joinpath("cura")))
 

+ 4 - 5
cura_app.py

@@ -15,13 +15,12 @@ if "" in sys.path:
 import argparse
 import faulthandler
 import os
+
+# try converting to integer
+os.environ["QT_QUICK_FLICKABLE_WHEEL_DECELERATION"] = str(int(os.environ.get("QT_QUICK_FLICKABLE_WHEEL_DECELERATION", "5000")))
+
 if sys.platform != "linux":  # Turns out the Linux build _does_ use this, but we're not making an Enterprise release for that system anyway.
     os.environ["QT_PLUGIN_PATH"] = ""  # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
-    try:
-        # try converting to integer
-        os.environ["QT_QUICK_FLICKABLE_WHEEL_DECELERATION"] = str(int(os.environ["QT_QUICK_FLICKABLE_WHEEL_DECELERATION"]))
-    except ValueError:
-        os.environ["QT_QUICK_FLICKABLE_WHEEL_DECELERATION"] = "5000"
     os.environ["QML2_IMPORT_PATH"] = ""  # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
     os.environ["QT_OPENGL_DLL"] = ""  # Security workaround: Don't need it, and introduces an attack vector, so set to nul.
 

+ 0 - 1
packaging/AppImage-builder/AppImageBuilder.yml.jinja

@@ -45,7 +45,6 @@ AppDir:
       LD_LIBRARY_PATH: "$APPDIR:$APPDIR/runtime/compat/:$APPDIR/usr/lib/x86_64-linux-gnu:$APPDIR/lib/x86_64-linux-gnu:$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders"
       PYTHONPATH: "$APPDIR"
       QT_PLUGIN_PATH: "$APPDIR/qt/plugins"
-      QT_QUICK_FLICKABLE_WHEEL_DECELERATION: "5000"
       QML2_IMPORT_PATH: "$APPDIR/qt/qml"
       QT_QPA_PLATFORMTHEME: xdgdesktopportal
       GDK_PIXBUF_MODULEDIR: $APPDIR/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders

+ 0 - 1
packaging/AppImage/AppRun

@@ -5,7 +5,6 @@ scriptdir=$(dirname $0)
 export PYTHONPATH="$scriptdir/lib/python3.10"
 export LD_LIBRARY_PATH=$scriptdir
 export QT_PLUGIN_PATH="$scriptdir/qt/plugins"
-export QT_QUICK_FLICKABLE_WHEEL_DECELERATION="5000"
 export QML2_IMPORT_PATH="$scriptdir/qt/qml"
 export QT_QPA_FONTDIR=/usr/share/fonts
 export QT_QPA_PLATFORMTHEME=xdgdesktopportal