rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set fixed height for the DateSeparator & TextLabel

This commit is contained in:
Konstantinos Sideris 2018-05-26 10:34:34 +03:00
parent bcba977f4c
commit 90595beb16
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/timeline/TimelineItem.h
View File

@ -68,12 +68,14 @@ public:
this, this,
&TextLabel::adjustHeight); &TextLabel::adjustHeight);
document()->setDocumentMargin(0); document()->setDocumentMargin(0);
setFixedHeight(20);
} }
void wheelEvent(QWheelEvent *event) override { event->ignore(); } void wheelEvent(QWheelEvent *event) override { event->ignore(); }
private slots: private slots:
void adjustHeight(const QSizeF &size) { setMinimumHeight(size.height()); } void adjustHeight(const QSizeF &size) { setFixedHeight(size.height()); }
}; };
class TimelineItem : public QWidget class TimelineItem : public QWidget

2
include/timeline/TimelineView.h
View File

@ -86,8 +86,6 @@ class DateSeparator : public QWidget
public: public:
DateSeparator(QDateTime datetime, QWidget *parent = nullptr); DateSeparator(QDateTime datetime, QWidget *parent = nullptr);
QSize sizeHint() const override { return QSize(width(), height_ + 2 * HMargin); }
void setTextColor(QColor color) { textColor_ = color; } void setTextColor(QColor color) { textColor_ = color; }
void setBoxColor(QColor color) { boxColor_ = color; } void setBoxColor(QColor color) { boxColor_ = color; }

2
src/timeline/TimelineView.cc
View File

@ -60,6 +60,8 @@ DateSeparator::DateSeparator(QDateTime datetime, QWidget *parent)
QFontMetrics fm{font_}; QFontMetrics fm{font_};
width_ = fm.width(msg_) + HPadding * 2; width_ = fm.width(msg_) + HPadding * 2;
height_ = fm.ascent() + 2 * VPadding; height_ = fm.ascent() + 2 * VPadding;
setFixedHeight(height_ + 2 * HMargin);
} }
void void