Mirrors/obs-aitum-multistream
1
0
Fork 0
mirror of https://github.com/Aitum/obs-aitum-multistream.git synced 2024-11-21 18:02:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Logo sizing changes for platform brand guidelines
Some checks failed
Push to master / Check Formatting 🔍 (push) Has been cancelled
Details
Push to master / Build Project 🧱 (push) Has been cancelled
Details
Push to master / Create Release 🛫 (push) Has been cancelled
Details

Browse Source
This commit is contained in:
David Marsh 2024-11-15 18:36:00 +00:00
parent be6e15dab2
commit 67182d2721
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-dialog.cpp
View File

@ -543,7 +543,7 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting
auto platformIconLabel = new QLabel; auto platformIconLabel = new QLabel;
auto platformIcon = auto platformIcon =
ConfigUtils::getPlatformIconFromEndpoint(QString::fromUtf8(obs_data_get_string(settings, "stream_server"))); ConfigUtils::getPlatformIconFromEndpoint(QString::fromUtf8(obs_data_get_string(settings, "stream_server")));
platformIconLabel->setPixmap(platformIcon.pixmap(30, 30)); platformIconLabel->setPixmap(platformIcon.pixmap(36, 36));
server_title_layout->addWidget(platformIconLabel, 0); server_title_layout->addWidget(platformIconLabel, 0);
auto streaming_title = new QLabel(QString::fromUtf8(obs_data_get_string(settings, "name"))); auto streaming_title = new QLabel(QString::fromUtf8(obs_data_get_string(settings, "name")));

BIN
media/youtube.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

11
multistream.cpp
View File

@ -126,6 +126,8 @@ auto outputTitleStyle = QString("QLabel{}");
auto outputGroupStyle = QString("background-color: %1; padding: 0px;") auto outputGroupStyle = QString("background-color: %1; padding: 0px;")
.arg(QPalette().color(QPalette::ColorRole::Mid).name(QColor::HexRgb)); // wrapper around above .arg(QPalette().color(QPalette::ColorRole::Mid).name(QColor::HexRgb)); // wrapper around above
auto outputPlatformIconSize = 36;
// For showing warning for no vertical integration // For showing warning for no vertical integration
void showVerticalWarning(QVBoxLayout *verticalLayout) void showVerticalWarning(QVBoxLayout *verticalLayout)
{ {
@ -146,7 +148,7 @@ void showVerticalWarning(QVBoxLayout *verticalLayout)
verticalLayout->addWidget(verticalWarning); verticalLayout->addWidget(verticalWarning);
} }
static config_t *(*get_user_config_func)(void) = nullptr; //static config_t *(*get_user_config_func)(void) = nullptr;
config_t *get_user_config(void) config_t *get_user_config(void)
{ {
@ -222,8 +224,7 @@ MultistreamDock::MultistreamDock(QWidget *parent) : QFrame(parent)
// blank because we're pulling settings through from bis later // blank because we're pulling settings through from bis later
mainPlatformIconLabel = new QLabel; mainPlatformIconLabel = new QLabel;
auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(QString::fromUtf8("")); auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(QString::fromUtf8(""));
mainPlatformIconLabel->setPixmap(platformIcon.pixmap(outputPlatformIconSize, outputPlatformIconSize));
mainPlatformIconLabel->setPixmap(platformIcon.pixmap(30, 30));
l2->addWidget(mainPlatformIconLabel); l2->addWidget(mainPlatformIconLabel);
l2->addWidget(bisHeaderLabel, 1); l2->addWidget(bisHeaderLabel, 1);
@ -404,7 +405,7 @@ MultistreamDock::MultistreamDock(QWidget *parent) : QFrame(parent)
: ""); : "");
if (url != mainPlatformUrl) { if (url != mainPlatformUrl) {
mainPlatformUrl = url; mainPlatformUrl = url;
mainPlatformIconLabel->setPixmap(ConfigUtils::getPlatformIconFromEndpoint(url).pixmap(30, 30)); mainPlatformIconLabel->setPixmap(ConfigUtils::getPlatformIconFromEndpoint(url).pixmap(outputPlatformIconSize, outputPlatformIconSize));
} }
int idx = 0; int idx = 0;
@ -638,7 +639,7 @@ void MultistreamDock::LoadOutput(obs_data_t *output_data, bool vertical)
auto platformIconLabel = new QLabel; auto platformIconLabel = new QLabel;
auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(endpoint); auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(endpoint);
platformIconLabel->setPixmap(platformIcon.pixmap(30, 30)); platformIconLabel->setPixmap(platformIcon.pixmap(outputPlatformIconSize, outputPlatformIconSize));
l2->addWidget(platformIconLabel); l2->addWidget(platformIconLabel);