From 6fdfcb38d7e3047bbc8eea29b459c699afe54d89 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Fri, 13 Aug 2021 20:08:28 +0100 Subject: [PATCH] marker: create color menu on the stack --- app/widget/marker/marker.cpp | 8 ++++---- app/widget/marker/marker.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/widget/marker/marker.cpp b/app/widget/marker/marker.cpp index 7a1713c22..b9c7a1390 100644 --- a/app/widget/marker/marker.cpp +++ b/app/widget/marker/marker.cpp @@ -38,9 +38,6 @@ Marker::Marker(QWidget *parent) : setContextMenuPolicy(Qt::CustomContextMenu); connect(this, &Marker::customContextMenuRequested, this, &Marker::ShowContextMenu); - - color_coding_menu_ = new ColorLabelMenu(); - connect(color_coding_menu_, &ColorLabelMenu::ColorSelected, this, &Marker::SetColor); } void Marker::paintEvent(QPaintEvent *event) @@ -85,7 +82,10 @@ void Marker::paintEvent(QPaintEvent *event) void Marker::ShowContextMenu() { Menu m(this); - m.addMenu(color_coding_menu_); + // Color menu + ColorLabelMenu color_coding_menu; + connect(&color_coding_menu, &ColorLabelMenu::ColorSelected, this, &Marker::SetColor); + m.addMenu(&color_coding_menu); m.exec(QCursor::pos()); } diff --git a/app/widget/marker/marker.h b/app/widget/marker/marker.h index da42d28e0..8b52027bd 100644 --- a/app/widget/marker/marker.h +++ b/app/widget/marker/marker.h @@ -44,7 +44,6 @@ class Marker : public QWidget { //void MouseDoubleClicked(); private: - ColorLabelMenu* color_coding_menu_; int marker_color_;