Compare commits

..

No commits in common. "8677051303b410608c363b8221b8fa77e61b7e19" and "ff27ea89d92dca420ad7435c7a99883d5f7b445f" have entirely different histories.

5 changed files with 2 additions and 25 deletions

View File

@ -213,9 +213,7 @@ Control {
Repeater {
delegate: Rectangle {
required property bool isWeekend
color: isWeekend ? palette.alternateBase : "transparent"
color: "transparent"
height: parent.height
width: control.dayWidth

View File

@ -14,10 +14,7 @@ Control {
model: model
delegate: Label {
id: delegate
required property string display
required property bool isWeekend
anchors.bottom: parent.bottom
anchors.top: parent.top
@ -27,10 +24,6 @@ Control {
verticalAlignment: Text.AlignVCenter
width: control.dayWidth
background: Rectangle {
color: delegate.isWeekend ? delegate.palette.alternateBase : "transparent"
}
Separator {
anchors.bottom: parent.bottom
anchors.right: parent.right

View File

@ -25,20 +25,11 @@ QVariant TimelineDayModel::data(const QModelIndex &index, int role) const
switch (role) {
case Qt::DisplayRole:
return QString::number(date.day());
case WeekendRole:
return date.dayOfWeek() > 5;
}
return {};
}
QHash<int, QByteArray> TimelineDayModel::roleNames() const
{
QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
roles[WeekendRole] = "isWeekend";
return roles;
}
QDate TimelineDayModel::fromDate() const
{
return m_fromDate;

View File

@ -13,15 +13,10 @@ class TimelineDayModel : public QAbstractListModel
Q_PROPERTY(QDate toDate READ toDate WRITE setToDate NOTIFY toDateChanged)
public:
enum Role {
WeekendRole = Qt::UserRole,
};
explicit TimelineDayModel(QObject *parent = nullptr);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QHash<int, QByteArray> roleNames() const override;
QDate fromDate() const;
void setFromDate(QDate date);

View File

@ -9,7 +9,7 @@ struct TimelineView::Item
, day(day)
{
item->setParentItem(&view);
item->setPosition(QPointF(day * view.dayWidth() + view.dayWidth() / 2, 0.0));
item->setPosition(QPointF(day * view.dayWidth(), 0.0));
item->setSize(QSizeF(len * view.dayWidth(), view.height()));
item->setVisible(true);
}