Skip to content

[pull] master from flameshot-org:master #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Apr 27, 2025
Merged

[pull] master from flameshot-org:master #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b7d41c
Improve the speed of calling grim (#3859)
lhz07 Apr 27, 2025
b35f977
enable PinWidget scrolling on macos with mouse (#3860)
gglin001 Apr 27, 2025
68594db
fix: add missing appstream data for flatpak builder (#3911)
macedigital Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions data/appdata/org.flameshot.Flameshot.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ SPDX-License-Identifier: CC0-1.0
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>Flameshot</name>
<developer id="org.flameshot">
<name>Flameshot Developers</name>
</developer>
<releases>
<release version="12.1.0" date="2022-07-03"/>
<release version="12.0.0" date="2022-06-21"/>
Expand All @@ -33,9 +36,11 @@ SPDX-License-Identifier: CC0-1.0
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/usageStatic.png</image>
<caption>Flameshot Usage</caption>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/flameshot-org/flameshot/master/data/img/preview/animatedUsage.gif</image>
<caption>Animated Flameshot Usage</caption>
</screenshot>
</screenshots>
<url type="homepage">https://github.com/flameshot-org/flameshot</url>
Expand Down
3 changes: 1 addition & 2 deletions src/tools/pin/pinwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
) {
Expand Down
8 changes: 6 additions & 2 deletions src/utils/screengrabber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading