Skip to content

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

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
Mar 21, 2026
Merged

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

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
f983251
Update QtColorWidgets git tag (#4584)
ElTh0r0 Mar 21, 2026
eebcc1c
Fix X11 crash (#4570)
borgmanJeremy Mar 21, 2026
b26cf40
fix: remove duplicate layout parent in SidePanelWidget (#4578)
benignobjunior Mar 21, 2026
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ else()
FetchContent_Declare(
qtColorWidgets
GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git
GIT_TAG 4f3c7e2af8e3138d89533475af66df42ccf08ef8
GIT_TAG 5d52e907e50dc88cf969b41cea44665ff6c475b1
)
#Workaround for duplicate GUID in windows WIX installer
if(WIN32)
Expand Down
5 changes: 3 additions & 2 deletions src/widgets/capture/capturewidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,9 @@ CaptureWidget::CaptureWidget(const CaptureRequest& req,
#else
// Call cmake with -DFLAMESHOT_DEBUG_CAPTURE=ON to enable easier debugging
#if !defined(FLAMESHOT_DEBUG_CAPTURE)
setWindowFlags(Qt::BypassWindowManagerHint | Qt::WindowStaysOnTopHint |
Qt::FramelessWindowHint | Qt::Tool);
// Note: Qt::BypassWindowManagerHint is removed to fix x11 gnome crash
setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint |
Qt::Tool);
#endif

// Always display on the selected screen (not spanning entire desktop)
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/panel/sidepanelwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ SidePanelWidget::SidePanelWidget(QPixmap* p, QWidget* parent)
m_layout->addWidget(m_colorWheel);
m_layout->addWidget(m_colorHex);

QHBoxLayout* gridHBoxLayout = new QHBoxLayout(this);
QHBoxLayout* gridHBoxLayout = new QHBoxLayout();
m_gridCheck = new QCheckBox(tr("Display grid"), this);
m_gridSizeSpin = new QSpinBox(this);
m_gridSizeSpin->setRange(5, 50);
Expand Down
Loading