From 90595beb16351b414d248f969eb32cb37fda84b0 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 26 May 2018 10:34:34 +0300 Subject: [PATCH] Set fixed height for the DateSeparator & TextLabel --- include/timeline/TimelineItem.h | 4 +++- include/timeline/TimelineView.h | 2 -- src/timeline/TimelineView.cc | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h index dda6662f..87e2080e 100644 --- a/include/timeline/TimelineItem.h +++ b/include/timeline/TimelineItem.h @@ -68,12 +68,14 @@ public: this, &TextLabel::adjustHeight); document()->setDocumentMargin(0); + + setFixedHeight(20); } void wheelEvent(QWheelEvent *event) override { event->ignore(); } private slots: - void adjustHeight(const QSizeF &size) { setMinimumHeight(size.height()); } + void adjustHeight(const QSizeF &size) { setFixedHeight(size.height()); } }; class TimelineItem : public QWidget diff --git a/include/timeline/TimelineView.h b/include/timeline/TimelineView.h index 2ad00058..e6e35ccb 100644 --- a/include/timeline/TimelineView.h +++ b/include/timeline/TimelineView.h @@ -86,8 +86,6 @@ class DateSeparator : public QWidget public: DateSeparator(QDateTime datetime, QWidget *parent = nullptr); - QSize sizeHint() const override { return QSize(width(), height_ + 2 * HMargin); } - void setTextColor(QColor color) { textColor_ = color; } void setBoxColor(QColor color) { boxColor_ = color; } diff --git a/src/timeline/TimelineView.cc b/src/timeline/TimelineView.cc index 94ecb304..71058d74 100644 --- a/src/timeline/TimelineView.cc +++ b/src/timeline/TimelineView.cc @@ -60,6 +60,8 @@ DateSeparator::DateSeparator(QDateTime datetime, QWidget *parent) QFontMetrics fm{font_}; width_ = fm.width(msg_) + HPadding * 2; height_ = fm.ascent() + 2 * VPadding; + + setFixedHeight(height_ + 2 * HMargin); } void