projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewWidget: Moved in drag_items
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 59127c364bb7f0bf35ed83e3de0a8398357d53d1..cce5e11b6f99ddb2cc4ecb4bac47707beaa6f959 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-84,8
+84,6
@@
const int View::MaxScrollValue = INT_MAX / 2;
const int View::ScaleUnits[3] = {1, 2, 5};
const int View::ScaleUnits[3] = {1, 2, 5};
-const QSizeF View::LabelPadding(4, 0);
-
View::View(Session &session, QWidget *parent) :
QAbstractScrollArea(parent),
session_(session),
View::View(Session &session, QWidget *parent) :
QAbstractScrollArea(parent),
session_(session),
@@
-117,9
+115,6
@@
View::View(Session &session, QWidget *parent) :
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(data_updated()));
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(data_updated()));
- connect(header_, SIGNAL(signals_moved()),
- this, SLOT(on_signals_moved()));
-
connect(header_, SIGNAL(selection_changed()),
ruler_, SLOT(clear_selection()));
connect(ruler_, SIGNAL(selection_changed()),
connect(header_, SIGNAL(selection_changed()),
ruler_, SLOT(clear_selection()));
connect(ruler_, SIGNAL(selection_changed()),
@@
-747,18
+742,14
@@
void View::data_updated()
viewport_->update();
}
viewport_->update();
}
-void View::on_signals_moved()
-{
- update_scroll();
- signals_moved();
-}
-
void View::process_sticky_events()
{
if (sticky_events_ & RowItemHExtentsChanged)
update_layout();
void View::process_sticky_events()
{
if (sticky_events_ & RowItemHExtentsChanged)
update_layout();
- if (sticky_events_ & RowItemVExtentsChanged)
+ if (sticky_events_ & RowItemVExtentsChanged)
{
restack_all_row_items();
restack_all_row_items();
+ update_scroll();
+ }
// Clear the sticky events
sticky_events_ = 0;
// Clear the sticky events
sticky_events_ = 0;