diff --git a/CMakeLists.txt b/CMakeLists.txt index fa396e5259..32105ca74b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/widgets/capture/capturewidget.cpp b/src/widgets/capture/capturewidget.cpp index d19acd38f3..4b15131557 100644 --- a/src/widgets/capture/capturewidget.cpp +++ b/src/widgets/capture/capturewidget.cpp @@ -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) diff --git a/src/widgets/panel/sidepanelwidget.cpp b/src/widgets/panel/sidepanelwidget.cpp index 227e583eff..76c013a864 100644 --- a/src/widgets/panel/sidepanelwidget.cpp +++ b/src/widgets/panel/sidepanelwidget.cpp @@ -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);