-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Grid layouts allow a lot more videos to be displayed at once, especially the bigger the window is. Currently, they're being used for the Home and Subscriptions tabs on the main page. There are some things that need to be done with this still. See issue #10.
- Loading branch information
1 parent
5441833
commit 016a834
Showing
13 changed files
with
285 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| #include "elidedtubelabel.h" | ||
| #include <QMouseEvent> | ||
| #include <QTextLayout> | ||
|
|
||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | ||
| void ElidedTubeLabel::enterEvent(QEnterEvent*) | ||
| #else | ||
| void ElidedTubeLabel::enterEvent(QEvent*) | ||
| #endif | ||
| { | ||
| if (m_clickable) | ||
| setCursor(QCursor(Qt::CursorShape::PointingHandCursor)); | ||
| if (m_underline) | ||
| setStyleSheet("QLabel { text-decoration: underline; }"); | ||
| } | ||
|
|
||
| void ElidedTubeLabel::leaveEvent(QEvent*) | ||
| { | ||
| if (m_clickable) | ||
| setCursor(QCursor()); | ||
| if (m_underline) | ||
| setStyleSheet(""); | ||
| } | ||
|
|
||
| void ElidedTubeLabel::mousePressEvent(QMouseEvent* event) | ||
| { | ||
| if (m_clickable && event->button() == Qt::LeftButton) | ||
| emit clicked(); | ||
| } | ||
|
|
||
| void ElidedTubeLabel::setText(const QString& text) | ||
| { | ||
| QFontMetrics fm(font()); | ||
| int lineSpacing = fm.lineSpacing(); | ||
| int y = 0; | ||
|
|
||
| QTextLayout textLayout(text, font()); | ||
| textLayout.beginLayout(); | ||
|
|
||
| QString outText; | ||
| forever | ||
| { | ||
| QTextLine line = textLayout.createLine(); | ||
| if (!line.isValid()) | ||
| break; | ||
|
|
||
| line.setLineWidth(width()); | ||
| int nextLineY = y + lineSpacing; | ||
|
|
||
| if (maximumHeight() >= nextLineY + lineSpacing) | ||
| { | ||
| outText += QStringView(text.mid(line.textStart(), line.textLength())); | ||
| y = nextLineY; | ||
| } | ||
| else | ||
| { | ||
| QString lastLine = text.mid(line.textStart()); | ||
| QString elidedLastLine = fm.elidedText(lastLine, Qt::ElideRight, width()); | ||
| outText += elidedLastLine; | ||
| line = textLayout.createLine(); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| textLayout.endLayout(); | ||
| QLabel::setText(outText); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #ifndef ELIDEDTUBELABEL_H | ||
| #define ELIDEDTUBELABEL_H | ||
| #include <QLabel> | ||
|
|
||
| class ElidedTubeLabel : public QLabel | ||
| { | ||
| Q_OBJECT | ||
| public: | ||
| explicit ElidedTubeLabel(QWidget* parent = nullptr) : QLabel(parent) {} | ||
| ElidedTubeLabel(const QString& text, QWidget* parent = nullptr) : ElidedTubeLabel(parent) { setText(text); } | ||
|
|
||
| void setClickable(bool clickable, bool underline) { m_clickable = clickable; m_underline = underline; } | ||
| void setText(const QString& text); | ||
| protected: | ||
| #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) | ||
| void enterEvent(QEnterEvent*) override; | ||
| #else | ||
| void enterEvent(QEvent*) override; | ||
| #endif | ||
| void leaveEvent(QEvent*) override; | ||
| void mousePressEvent(QMouseEvent* event) override; | ||
| signals: | ||
| void clicked(); | ||
| private: | ||
| bool m_clickable = false; | ||
| bool m_underline = false; | ||
| }; | ||
|
|
||
| #endif // ELIDEDTUBELABEL_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #include "browsevideorenderer.h" | ||
|
|
||
| BrowseVideoRenderer::BrowseVideoRenderer(QWidget* parent) | ||
| : VideoRenderer(parent), hbox(new QHBoxLayout(this)), textVbox(new QVBoxLayout) | ||
| { | ||
| setThumbnailSize(QSize(240, 0)); | ||
| textVbox->addWidget(titleLabel); | ||
| textVbox->addWidget(channelLabel); | ||
| textVbox->addWidget(metadataLabel); | ||
|
|
||
| hbox->addWidget(thumbLabel); | ||
| hbox->addLayout(textVbox, 1); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #ifndef BROWSEVIDEORENDERER_H | ||
| #define BROWSEVIDEORENDERER_H | ||
| #include "videorenderer.h" | ||
| #include <QVBoxLayout> | ||
|
|
||
| class BrowseVideoRenderer : public VideoRenderer | ||
| { | ||
| public: | ||
| explicit BrowseVideoRenderer(QWidget* parent = nullptr); | ||
| private: | ||
| QHBoxLayout* hbox; | ||
| QVBoxLayout* textVbox; | ||
| }; | ||
|
|
||
| #endif // BROWSEVIDEORENDERER_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #include "gridvideorenderer.h" | ||
| #include "utils/uiutils.h" | ||
| #include <QApplication> | ||
|
|
||
| GridVideoRenderer::GridVideoRenderer(QWidget* parent) : VideoRenderer(parent), vbox(new QVBoxLayout(this)) | ||
| { | ||
| setThumbnailSize(QSize(205, 115)); | ||
|
|
||
| titleLabel->setFont(QFont(qApp->font().toString(), qApp->font().pointSize() + 1, QFont::Bold)); | ||
| titleLabel->setWordWrap(true); | ||
| UIUtils::setMaximumLines(titleLabel, 2); | ||
|
|
||
| channelLabel->text->setFont(QFont(qApp->font().toString(), qApp->font().pointSize() - 1)); | ||
|
|
||
| metadataLabel->setFont(QFont(qApp->font().toString(), qApp->font().pointSize() - 1)); | ||
| metadataLabel->setWordWrap(true); | ||
| UIUtils::setMaximumLines(metadataLabel, 2); | ||
|
|
||
| vbox->addWidget(thumbLabel); | ||
| vbox->addWidget(titleLabel); | ||
| vbox->addWidget(channelLabel); | ||
| vbox->addWidget(metadataLabel); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #ifndef GRIDVIDEORENDERER_H | ||
| #define GRIDVIDEORENDERER_H | ||
| #include "videorenderer.h" | ||
| #include <QVBoxLayout> | ||
|
|
||
| class GridVideoRenderer : public VideoRenderer | ||
| { | ||
| public: | ||
| explicit GridVideoRenderer(QWidget* parent = nullptr); | ||
| private: | ||
| QVBoxLayout* vbox; | ||
| }; | ||
|
|
||
| #endif // GRIDVIDEORENDERER_H |
Oops, something went wrong.