diff --git a/data/appdata/org.flameshot.Flameshot.metainfo.xml b/data/appdata/org.flameshot.Flameshot.metainfo.xml index a4242951c2..32aa6af728 100644 --- a/data/appdata/org.flameshot.Flameshot.metainfo.xml +++ b/data/appdata/org.flameshot.Flameshot.metainfo.xml @@ -8,6 +8,9 @@ SPDX-License-Identifier: CC0-1.0 CC0-1.0 GPL-3.0-or-later Flameshot + + Flameshot Developers + @@ -33,9 +36,11 @@ SPDX-License-Identifier: CC0-1.0 https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/usageStatic.png + Flameshot Usage https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/animatedUsage.gif + Animated Flameshot Usage https://github.com/flameshot-org/flameshot diff --git a/src/tools/pin/pinwidget.cpp b/src/tools/pin/pinwidget.cpp index a1a0ace5c0..74f18faacc 100644 --- a/src/tools/pin/pinwidget.cpp +++ b/src/tools/pin/pinwidget.cpp @@ -106,8 +106,7 @@ bool PinWidget::scrollEvent(QWheelEvent* event) { const auto phase = event->phase(); if (phase == Qt::ScrollPhase::ScrollUpdate -#if defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS) - // Linux is getting only NoScrollPhase events. +#if defined(Q_OS_LINUX) || defined(Q_OS_WINDOWS) || defined(Q_OS_MACOS) || phase == Qt::ScrollPhase::NoScrollPhase #endif ) { diff --git a/src/utils/screengrabber.cpp b/src/utils/screengrabber.cpp index 9ce3854f43..8e28750350 100644 --- a/src/utils/screengrabber.cpp +++ b/src/utils/screengrabber.cpp @@ -31,13 +31,17 @@ void ScreenGrabber::generalGrimScreenshot(bool& ok, QPixmap& res) { #ifdef USE_WAYLAND_GRIM #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX) + QString runDir = QProcessEnvironment::systemEnvironment().value("XDG_RUNTIME_DIR"); + QString imgPath = runDir + "/flameshot.ppm"; QProcess Process; QString program = "grim"; QStringList arguments; - arguments << "-"; + arguments << "-t" << "ppm" << imgPath; Process.start(program, arguments); if (Process.waitForFinished()) { - res.loadFromData(Process.readAll()); + res.load(imgPath, "ppm"); + QFile imgFile(imgPath); + imgFile.remove(); ok = true; } else { ok = false;