-
-
Notifications
You must be signed in to change notification settings - Fork 8.8k
frontend: Replace add source dropdown with dialog #12067
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Warchamp7
wants to merge
4
commits into
obsproject:master
Choose a base branch
from
Warchamp7:add-source-window
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+2,634
−520
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,134 @@ | ||
| /****************************************************************************** | ||
| Copyright (C) 2025 by Taylor Giampaolo <[email protected]> | ||
|
|
||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 2 of the License, or | ||
| (at your option) any later version. | ||
|
|
||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
|
|
||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| ******************************************************************************/ | ||
|
|
||
| #include <components/FlowFrame.hpp> | ||
|
|
||
| #include <QKeyEvent> | ||
| #include <QScrollArea> | ||
|
|
||
| FlowFrame::FlowFrame(QWidget *parent) : QFrame(parent) | ||
| { | ||
| layout = new FlowLayout(this); | ||
| setLayout(layout); | ||
| } | ||
|
|
||
| void FlowFrame::keyPressEvent(QKeyEvent *event) | ||
| { | ||
| QWidget *focused = focusWidget(); | ||
| if (!focused) { | ||
| return; | ||
| } | ||
|
|
||
| int index = -1; | ||
| for (int i = 0; i < layout->count(); ++i) { | ||
| if (!layout->itemAt(i)->widget()) { | ||
| continue; | ||
| } | ||
|
|
||
| auto focusProxy = layout->itemAt(i)->widget()->focusProxy(); | ||
| if (layout->itemAt(i)->widget() == focused || focusProxy == focused) { | ||
| if (focusProxy == focused) { | ||
| focused = layout->itemAt(i)->widget(); | ||
| } | ||
|
|
||
| index = i; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (index == -1) { | ||
| return; | ||
| } | ||
|
|
||
| const QRect focusedRect = focused->geometry(); | ||
| QWidget *nextFocus = nullptr; | ||
|
|
||
| switch (event->key()) { | ||
| case Qt::Key_Right: | ||
| case Qt::Key_Down: | ||
| case Qt::Key_Left: | ||
| case Qt::Key_Up: { | ||
| // Find next widget in the given direction | ||
| int bestDistance = INT_MAX; | ||
| for (int i = 0; i < layout->count(); ++i) { | ||
| if (i == index) { | ||
| continue; | ||
| } | ||
|
|
||
| QWidget *widget = layout->itemAt(i)->widget(); | ||
| const QRect rect = widget->geometry(); | ||
|
|
||
| bool isCandidate = false; | ||
| int distance = INT_MAX; | ||
|
|
||
| switch (event->key()) { | ||
| case Qt::Key_Right: | ||
| if (rect.left() > focusedRect.right()) { | ||
| distance = (rect.left() - focusedRect.right()) + | ||
| qAbs(rect.center().y() - focusedRect.center().y()); | ||
| isCandidate = true; | ||
| } | ||
| break; | ||
| case Qt::Key_Left: | ||
| if (rect.right() < focusedRect.left()) { | ||
| distance = (focusedRect.left() - rect.right()) + | ||
| qAbs(rect.center().y() - focusedRect.center().y()); | ||
| isCandidate = true; | ||
| } | ||
| break; | ||
| case Qt::Key_Down: | ||
| if (rect.top() > focusedRect.bottom()) { | ||
| distance = (rect.top() - focusedRect.bottom()) + | ||
| qAbs(rect.center().x() - focusedRect.center().x()); | ||
| isCandidate = true; | ||
| } | ||
| break; | ||
| case Qt::Key_Up: | ||
| if (rect.bottom() < focusedRect.top()) { | ||
| distance = (focusedRect.top() - rect.bottom()) + | ||
| qAbs(rect.center().x() - focusedRect.center().x()); | ||
| isCandidate = true; | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| if (isCandidate && distance < bestDistance) { | ||
| bestDistance = distance; | ||
| nextFocus = widget; | ||
| } | ||
| } | ||
| break; | ||
| } | ||
| default: | ||
| QWidget::keyPressEvent(event); | ||
| return; | ||
| } | ||
|
|
||
| if (nextFocus) { | ||
| nextFocus->setFocus(); | ||
|
|
||
| QWidget *scrollParent = nextFocus->parentWidget(); | ||
| while (scrollParent) { | ||
| QScrollArea *scrollArea = qobject_cast<QScrollArea *>(scrollParent); | ||
| if (scrollArea) { | ||
| scrollArea->ensureWidgetVisible(nextFocus, 20, 20); | ||
| break; | ||
| } | ||
| scrollParent = scrollParent->parentWidget(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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,37 @@ | ||
| /****************************************************************************** | ||
| Copyright (C) 2025 by Taylor Giampaolo <[email protected]> | ||
|
|
||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 2 of the License, or | ||
| (at your option) any later version. | ||
|
|
||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
|
|
||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| ******************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "FlowLayout.hpp" | ||
|
|
||
| #include <QFrame> | ||
|
|
||
| class FlowFrame : public QFrame { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| explicit FlowFrame(QWidget *parent = nullptr); | ||
|
|
||
| FlowLayout *flowLayout() const { return layout; } | ||
|
|
||
| protected: | ||
| void keyPressEvent(QKeyEvent *event) override; | ||
|
|
||
| private: | ||
| FlowLayout *layout; | ||
| }; |
This file contains hidden or 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,166 @@ | ||
| /****************************************************************************** | ||
| Example provided by Qt | ||
| <https://doc.qt.io/qt-6/qtwidgets-layouts-flowlayout-example.html> | ||
|
|
||
| Copyright (C) 2016 The Qt Company Ltd. | ||
| SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause | ||
| ******************************************************************************/ | ||
|
|
||
| #include "FlowLayout.hpp" | ||
|
|
||
| #include <QWidget> | ||
|
|
||
| FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing) | ||
| : QLayout(parent), | ||
| m_hSpace(hSpacing), | ||
| m_vSpace(vSpacing) | ||
| { | ||
| setContentsMargins(margin, margin, margin, margin); | ||
| } | ||
|
|
||
| FlowLayout::FlowLayout(int margin, int hSpacing, int vSpacing) : m_hSpace(hSpacing), m_vSpace(vSpacing) | ||
| { | ||
| setContentsMargins(margin, margin, margin, margin); | ||
| } | ||
|
|
||
| FlowLayout::~FlowLayout() | ||
| { | ||
| QLayoutItem *item; | ||
| while ((item = takeAt(0))) { | ||
| delete item; | ||
| } | ||
| } | ||
|
|
||
| void FlowLayout::addItem(QLayoutItem *item) | ||
| { | ||
| itemList.append(item); | ||
| } | ||
|
|
||
| int FlowLayout::horizontalSpacing() const | ||
| { | ||
| if (m_hSpace >= 0) { | ||
| return m_hSpace; | ||
| } else { | ||
| return smartSpacing(QStyle::PM_LayoutHorizontalSpacing); | ||
| } | ||
| } | ||
|
|
||
| int FlowLayout::verticalSpacing() const | ||
| { | ||
| if (m_vSpace >= 0) { | ||
| return m_vSpace; | ||
| } else { | ||
| return smartSpacing(QStyle::PM_LayoutVerticalSpacing); | ||
| } | ||
| } | ||
|
|
||
| int FlowLayout::count() const | ||
| { | ||
| return itemList.size(); | ||
| } | ||
|
|
||
| QLayoutItem *FlowLayout::itemAt(int index) const | ||
| { | ||
| return itemList.value(index); | ||
| } | ||
|
|
||
| QLayoutItem *FlowLayout::takeAt(int index) | ||
| { | ||
| if (index >= 0 && index < itemList.size()) { | ||
| return itemList.takeAt(index); | ||
| } | ||
| return nullptr; | ||
| } | ||
|
|
||
| Qt::Orientations FlowLayout::expandingDirections() const | ||
| { | ||
| return {}; | ||
| } | ||
|
|
||
| bool FlowLayout::hasHeightForWidth() const | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| int FlowLayout::heightForWidth(int width) const | ||
| { | ||
| int height = doLayout(QRect(0, 0, width, 0), true); | ||
| return height; | ||
| } | ||
|
|
||
| void FlowLayout::setGeometry(const QRect &rect) | ||
| { | ||
| QLayout::setGeometry(rect); | ||
| doLayout(rect, false); | ||
| } | ||
|
|
||
| QSize FlowLayout::sizeHint() const | ||
| { | ||
| return minimumSize(); | ||
| } | ||
|
|
||
| QSize FlowLayout::minimumSize() const | ||
| { | ||
| QSize size; | ||
| for (const QLayoutItem *item : std::as_const(itemList)) { | ||
| size = size.expandedTo(item->minimumSize()); | ||
| } | ||
|
|
||
| const QMargins margins = contentsMargins(); | ||
| size += QSize(margins.left() + margins.right(), margins.top() + margins.bottom()); | ||
| return size; | ||
| } | ||
|
|
||
| int FlowLayout::doLayout(const QRect &rect, bool testOnly) const | ||
| { | ||
| int left, top, right, bottom; | ||
| getContentsMargins(&left, &top, &right, &bottom); | ||
| QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom); | ||
| int x = effectiveRect.x(); | ||
| int y = effectiveRect.y(); | ||
| int lineHeight = 0; | ||
|
|
||
| for (QLayoutItem *item : std::as_const(itemList)) { | ||
| const QWidget *wid = item->widget(); | ||
| int spaceX = horizontalSpacing(); | ||
| if (spaceX == -1) { | ||
| spaceX = wid->style()->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, | ||
| Qt::Horizontal); | ||
| } | ||
|
|
||
| int spaceY = verticalSpacing(); | ||
| if (spaceY == -1) { | ||
| spaceY = wid->style()->layoutSpacing(QSizePolicy::PushButton, QSizePolicy::PushButton, | ||
| Qt::Vertical); | ||
| } | ||
|
|
||
| int nextX = x + item->sizeHint().width() + spaceX; | ||
| if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) { | ||
| x = effectiveRect.x(); | ||
| y = y + lineHeight + spaceY; | ||
| nextX = x + item->sizeHint().width() + spaceX; | ||
| lineHeight = 0; | ||
| } | ||
|
|
||
| if (!testOnly) { | ||
| item->setGeometry(QRect(QPoint(x, y), item->sizeHint())); | ||
| } | ||
|
|
||
| x = nextX; | ||
| lineHeight = qMax(lineHeight, item->sizeHint().height()); | ||
| } | ||
| return y + lineHeight - rect.y() + bottom; | ||
| } | ||
|
|
||
| int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const | ||
| { | ||
| QObject *parent = this->parent(); | ||
| if (!parent) { | ||
| return -1; | ||
| } else if (parent->isWidgetType()) { | ||
| QWidget *pw = static_cast<QWidget *>(parent); | ||
| return pw->style()->pixelMetric(pm, nullptr, pw); | ||
| } else { | ||
| return static_cast<QLayout *>(parent)->spacing(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.