projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CursorPair: Added frequency indication
[pulseview.git]
/
pv
/
widgets
/
popuptoolbutton.cpp
diff --git
a/pv/widgets/popuptoolbutton.cpp
b/pv/widgets/popuptoolbutton.cpp
index 74743ed4e27b1fdac8a77d807fb8e579329afc12..75aa76a552777e2fe44aa056cd7f8711f401e9e5 100644
(file)
--- a/
pv/widgets/popuptoolbutton.cpp
+++ b/
pv/widgets/popuptoolbutton.cpp
@@
-20,38
+20,38
@@
#include <assert.h>
#include <assert.h>
-#include "popuptoolbutton.h"
+#include "popuptoolbutton.h
pp
"
namespace pv {
namespace widgets {
PopupToolButton::PopupToolButton(QWidget *parent) :
QToolButton(parent),
namespace pv {
namespace widgets {
PopupToolButton::PopupToolButton(QWidget *parent) :
QToolButton(parent),
-
_popup
(NULL)
+
popup_
(NULL)
{
connect(this, SIGNAL(clicked(bool)), this, SLOT(on_clicked(bool)));
}
Popup* PopupToolButton::popup() const
{
{
connect(this, SIGNAL(clicked(bool)), this, SLOT(on_clicked(bool)));
}
Popup* PopupToolButton::popup() const
{
- return
_popup
;
+ return
popup_
;
}
void PopupToolButton::set_popup(Popup *popup)
{
assert(popup);
}
void PopupToolButton::set_popup(Popup *popup)
{
assert(popup);
-
_popup
= popup;
+
popup_
= popup;
}
void PopupToolButton::on_clicked(bool)
{
}
void PopupToolButton::on_clicked(bool)
{
- if(!
_popup
)
+ if(!
popup_
)
return;
const QRect r = rect();
return;
const QRect r = rect();
-
_popup
->set_position(mapToGlobal(QPoint((r.left() + r.right()) / 2,
+
popup_
->set_position(mapToGlobal(QPoint((r.left() + r.right()) / 2,
((r.top() + r.bottom() * 3) / 4))), Popup::Bottom);
((r.top() + r.bottom() * 3) / 4))), Popup::Bottom);
-
_popup
->show();
+
popup_
->show();
}
} // widgets
}
} // widgets