projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced std::pair<Cursor, Cursor> with CursorPair
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index a615e8513e7ff04d95b1b56af7c24299858af4c9..6d016fe0b441aa832a504e64704fd564ac67d59c 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-71,11
+71,8
@@
boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
{
assert(s);
{
assert(s);
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
-
- if (s->pt_in_label_rect(signal_heading_rect, pt))
+ if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
+ 0, w, pt))
return s;
}
return s;
}
@@
-97,13
+94,10
@@
void Header::paintEvent(QPaintEvent*)
{
assert(s);
{
assert(s);
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
-
+ const int y = s->get_v_offset() - v_offset;
const bool highlight = !dragging && s->pt_in_label_rect(
const bool highlight = !dragging && s->pt_in_label_rect(
-
signal_heading_rect
, _mouse_point);
- s->paint_label(painter,
signal_heading_rect
, highlight);
+
y, 0, w
, _mouse_point);
+ s->paint_label(painter,
y, w
, highlight);
}
painter.end();
}
painter.end();
@@
-224,14
+218,16
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
void Header::on_action_set_name_triggered()
{
void Header::on_action_set_name_triggered()
{
+ bool ok = false;
+
shared_ptr<view::Signal> context_signal = _context_signal;
if (!context_signal)
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
shared_ptr<view::Signal> context_signal = _context_signal;
if (!context_signal)
return;
const QString new_label = QInputDialog::getText(this, tr("Set Name"),
- tr("Name"), QLineEdit::Normal, context_signal->get_name());
+ tr("Name"), QLineEdit::Normal, context_signal->get_name()
, &ok
);
- if (
!new_label.isEmpty()
)
+ if (
ok
)
context_signal->set_name(new_label);
}
context_signal->set_name(new_label);
}