diff options
author | Peter Wu <peter@lekensteyn.nl> | 2017-03-02 22:10:36 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-03-03 04:58:09 +0000 |
commit | 8f35d6ff900120afe53ffaa9284ed86b5db9614a (patch) | |
tree | b6ee2d03b7e96719552f9bd43722459ecf7d9bba | |
parent | a9ec1e41b19abd9da62f15ffbd94db3dbc4a3d9f (diff) |
Qt: allow Packet Bytes view to be shrinked
Even if a packet has only one or two lines for the byte view, Qt
autoresizing insists to require a minimum of 5.5 lines (or 7.5 lines for
packets without multiple data sources). Remove this artificial
requirement and allow the packet bytes view to be resized to show
nothing (except for possible data sources tabs).
This makes it easier to fit more packets and details for screenshots.
Change-Id: I3ea997b9effa8292b396dc2ceb2ab1c35cead410
Reviewed-on: https://code.wireshark.org/review/20342
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r-- | ui/qt/byte_view_text.cpp | 6 | ||||
-rw-r--r-- | ui/qt/byte_view_text.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp index 4ac950ede3..bf565a728e 100644 --- a/ui/qt/byte_view_text.cpp +++ b/ui/qt/byte_view_text.cpp @@ -123,6 +123,12 @@ ByteViewText::~ByteViewText() ctx_menu_.clear(); } +QSize ByteViewText::minimumSizeHint() const +{ + // Allow panel to be shrinked to any size + return QSize(); +} + bool ByteViewText::hasDataSource(const tvbuff_t *ds_tvb) { if (ds_tvb != NULL && ds_tvb == tvb_) return true; diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h index 0e91e084ba..f2af3c01d1 100644 --- a/ui/qt/byte_view_text.h +++ b/ui/qt/byte_view_text.h @@ -44,6 +44,7 @@ class ByteViewText : public QAbstractScrollArea public: explicit ByteViewText(QWidget *parent = 0, tvbuff_t *tvb = NULL, proto_tree *tree = NULL, QTreeWidget *protoTree = NULL, packet_char_enc encoding = PACKET_CHAR_ENC_CHAR_ASCII); ~ByteViewText(); + virtual QSize minimumSizeHint() const; bool hasDataSource(const tvbuff_t *ds_tvb = NULL); void setFormat(bytes_view_type format); |