X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fflag.cpp;h=1cdaea8448ffdd5ad8107ca9c961a3842e544f14;hp=1db843e08193e5508d8298da841e82389be102fe;hb=5a20644617a727e5893cd1df3f105135c1ebdedd;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff diff --git a/pv/views/trace/flag.cpp b/pv/views/trace/flag.cpp index 1db843e0..1cdaea84 100644 --- a/pv/views/trace/flag.cpp +++ b/pv/views/trace/flag.cpp @@ -36,16 +36,16 @@ namespace pv { namespace views { namespace trace { -const QColor Flag::FillColour(0x73, 0xD2, 0x16); +const QColor Flag::FillColor(0x73, 0xD2, 0x16); Flag::Flag(View &view, const pv::util::Timestamp& time, const QString &text) : - TimeMarker(view, FillColour, time), + TimeMarker(view, FillColor, time), text_(text) { } Flag::Flag(const Flag &flag) : - TimeMarker(flag.view_, FillColour, flag.time_), + TimeMarker(flag.view_, FillColor, flag.time_), enable_shared_from_this(flag) { } @@ -66,7 +66,7 @@ pv::widgets::Popup* Flag::create_popup(QWidget *parent) Popup *const popup = TimeMarker::create_popup(parent); popup->set_position(parent->mapToGlobal( - point(parent->rect())), Popup::Bottom); + drag_point(parent->rect())), Popup::Bottom); QFormLayout *const form = (QFormLayout*)popup->layout();