DecoderOutputView: Allow for adaptive size constraints

[pulseview.git] / pv / views / decoder_output / QHexView.cpp

diff --git a/pv/views/decoder_output/QHexView.cpp b/pv/views/decoder_output/QHexView.cpp
index ca2d91b572b7efe3b7ecc2c14b56f6921e4357d8..06df103b7f45c43b9aa19cc75d3e22260eace604 100644 (file)
--- a/pv/views/decoder_output/QHexView.cpp
+++ b/pv/views/decoder_output/QHexView.cpp
@@ -121,6 +121,11 @@ void QHexView::showFromOffset(size_t offset)
        viewport()->update();
 }
 
+QSizePolicy QHexView::sizePolicy() const
+{
+       return QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+}
+
 void QHexView::initialize_byte_iterator(size_t offset)
 {
        current_chunk_id_ = 0;
@@ -173,10 +178,12 @@ uint8_t QHexView::get_next_byte(bool* is_next_chunk)
 
 QSize QHexView::getFullSize() const
 {
-       size_t width = posAscii_ + (BYTES_PER_LINE * charWidth_) +
-               GAP_ASCII_SLIDER + verticalScrollBar()->width();
+       size_t width = posAscii_ + (BYTES_PER_LINE * charWidth_);
+
+       if (verticalScrollBar()->isEnabled())
+               width += GAP_ASCII_SLIDER + verticalScrollBar()->width();
 
-       if (!data_)
+       if (!data_ || (data_size_ == 0))
                return QSize(width, 0);
 
        size_t height = data_size_ / BYTES_PER_LINE;
@@ -199,8 +206,13 @@ void QHexView::paintEvent(QPaintEvent *event)
        setMaximumWidth(widgetSize.width());
        QSize areaSize = viewport()->size();
 
-       verticalScrollBar()->setPageStep(areaSize.height() / charHeight_);
-       verticalScrollBar()->setRange(0, (widgetSize.height() - areaSize.height()) / charHeight_ + 1);
+       // Only show scrollbar if the content goes beyond the visible area
+       if (widgetSize.height() > areaSize.height()) {
+               verticalScrollBar()->setEnabled(true);
+               verticalScrollBar()->setPageStep(areaSize.height() / charHeight_);
+               verticalScrollBar()->setRange(0, ((widgetSize.height() - areaSize.height())) / charHeight_ + 1);
+       } else
+               verticalScrollBar()->setEnabled(false);
 
        // Fill widget background
        painter.fillRect(event->rect(), palette().color(QPalette::Base));