Bring back sticky scroll and coloured background shortcuts.

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index a086d23de523f07e2be1192cbfc3b4bd2a028b09..e8774f332b235dfa20222c4cd5da09202a0b1371 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
@@ -146,6 +145,7 @@ View::View(Session &session, QWidget *parent) :
        offset_(0),
        updating_scroll_(false),
        sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
+       coloured_bg_(false),
        always_zoom_to_fit_(false),
        tick_period_(0),
        tick_prefix_(pv::util::SIPrefix::yocto),
@@ -155,7 +155,10 @@ View::View(Session &session, QWidget *parent) :
        cursors_(new CursorPair(*this)),
        next_flag_text_('A'),
        trigger_markers_(),
-       hover_point_(-1, -1)
+       hover_point_(-1, -1),
+       scroll_needs_defaults_(false),
+       saved_v_offset_(0),
+       size_finalized_(false)
 {
        connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
                this, SLOT(h_scroll_value_changed(int)));
@@ -280,6 +283,8 @@ const Viewport* View::viewport() const
 void View::save_settings(QSettings &settings) const
 {
        settings.setValue("scale", scale_);
+       settings.setValue("v_offset",
+               scrollarea_.verticalScrollBar()->sliderPosition());
 
        std::stringstream ss;
        boost::archive::text_oarchive oa(ss);
@@ -295,6 +300,9 @@ void View::save_settings(QSettings &settings) const
 
 void View::restore_settings(QSettings &settings)
 {
+       // Note: It is assumed that this function is only called once,
+       // immediately after restoring a previous session.
+
        if (settings.contains("scale"))
                set_scale(settings.value("scale").toDouble());
 
@@ -314,6 +322,13 @@ void View::restore_settings(QSettings &settings)
                signal->restore_settings(settings);
                settings.endGroup();
        }
+
+       if (settings.contains("v_offset")) {
+               saved_v_offset_ = settings.value("v_offset").toInt();
+               set_v_offset(saved_v_offset_);
+               scroll_needs_defaults_ = false;
+               // Note: see resizeEvent() for additional information
+       }
 }
 
 vector< shared_ptr<TimeItem> > View::time_items() const
@@ -549,11 +564,23 @@ void View::enable_sticky_scrolling(bool state)
        sticky_scrolling_ = state;
 }
 
+void View::toggle_sticky_scrolling(void)
+{
+       sticky_scrolling_ = !sticky_scrolling_;
+}
+
+bool View::get_coloured_bg(void)
+{
+       return coloured_bg_;
+}
+
 void View::enable_coloured_bg(bool state)
 {
        const vector<shared_ptr<TraceTreeItem>> items(
                list_by_type<TraceTreeItem>());
 
+       coloured_bg_ = state;
+
        for (shared_ptr<TraceTreeItem> i : items) {
                // Can't cast to Trace because it's abstract, so we need to
                // check for any derived classes individually
@@ -576,6 +603,11 @@ void View::enable_coloured_bg(bool state)
        viewport_->update();
 }
 
+void View::toggle_coloured_bg(void)
+{
+       enable_coloured_bg(!coloured_bg_);
+}
+
 bool View::cursors_shown() const
 {
        return show_cursors_;
@@ -798,7 +830,7 @@ void View::update_scroll()
                vscrollbar->setRange(extents.first - areaSize.height(),
                        extents.second);
 
-       if (scroll_needs_defaults)
+       if (scroll_needs_defaults_)
                set_scroll_default();
 }
 
@@ -813,15 +845,6 @@ void View::set_scroll_default()
 
        const QSize areaSize = viewport_->size();
 
-       // Special case: when starting up and the window isn't visible yet,
-       // areaSize is [0, 0]. In this case we want to be called again later
-       if (areaSize.height() == 0) {
-               scroll_needs_defaults = true;
-               return;
-       } else {
-               scroll_needs_defaults = false;
-       }
-
        const pair<int, int> extents = v_extents();
        const int trace_height = extents.second - extents.first;
 
@@ -833,6 +856,11 @@ void View::set_scroll_default()
        else
                // Put the first trace at the top, letting the bottom ones overflow
                set_v_offset(extents.first);
+
+       // If we're not sure whether setting the defaults worked as
+       // the window wasn't set up entirely yet, we want to be called
+       // again later to make sure
+       scroll_needs_defaults_ = !size_finalized_;
 }
 
 void View::update_layout()
@@ -956,6 +984,27 @@ bool View::eventFilter(QObject *object, QEvent *event)
 void View::resizeEvent(QResizeEvent*)
 {
        update_layout();
+
+       // This is somewhat of a hack, unfortunately. We cannot use
+       // set_v_offset() from within restore_settings() as the view
+       // at that point is neither visible nor properly sized.
+       // This is the least intrusive workaround I could come up
+       // with: set the vertical offset (or scroll defaults) when
+       // the view is visible and resized to its final size.
+       // Resize events that are sent when the view is not visible
+       // must be ignored as they have wrong sizes, potentially
+       // preventing the v offset from being set successfully.
+
+       if (isVisible())
+               size_finalized_ = true;
+
+       if (size_finalized_ && saved_v_offset_) {
+               set_v_offset(saved_v_offset_);
+               saved_v_offset_ = 0;
+       }
+
+       if (size_finalized_ && scroll_needs_defaults_)
+               set_scroll_default();
 }
 
 void View::row_item_appearance_changed(bool label, bool content)
@@ -1161,11 +1210,11 @@ void View::signals_changed()
                }
 
        // Add and position the pending top levels items
+       int offset = v_extents().second;
        for (auto item : new_top_level_items) {
                add_child_item(item);
 
                // Position the item after the last item or at the top if there is none
-               int offset = v_extents().second;
                const pair<int, int> extents = item->v_extents();
 
                if (item->enabled())