jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Truncate names in advanced audio dialog

Browse Source 
This limits the length of the name label in the advanced audio
dialog to 80 characters, so the dialog doesn't get too wide. If the
name is truncated, "..." are added at the end of the label, and the
label's tooltip is set to the full name of the source.
This commit is contained in:
cg2121 2022-05-16 02:43:41 -05:00 committed by Matt Gajownik
parent bb6787968c
commit 0d0b65e8c8
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
UI/adv-audio-control.cpp
View File

@ -366,8 +366,7 @@ void OBSAdvAudioCtrl::OBSSourceRenamed(void *param, calldata_t *calldata)
QString newName = QT_UTF8(calldata_string(calldata, "new_name"));
QMetaObject::invokeMethod(reinterpret_cast<OBSAdvAudioCtrl *>(param),
"SetSourceName",
Q_ARG(const QString &, newName));
"SetSourceName", Q_ARG(QString &, newName));
}
/* ------------------------------------------------------------------------- */
@ -700,8 +699,7 @@ void OBSAdvAudioCtrl::SetIconVisible(bool visible)
visible ? iconLabel->show() : iconLabel->hide();
}
void OBSAdvAudioCtrl::SetSourceName(const QString &newName)
void OBSAdvAudioCtrl::SetSourceName(QString &newName)
{
if (nameLabel->text() != newName)
nameLabel->setText(newName);
TruncateLabel(nameLabel, newName);
}

2
UI/adv-audio-control.hpp
View File

@ -87,7 +87,7 @@ public slots:
void SourceMonitoringTypeChanged(int type);
void SourceMixersChanged(uint32_t mixers);
void SourceBalanceChanged(int balance);
void SetSourceName(const QString &newNamw);
void SetSourceName(QString &newNamw);
void volumeChanged(double db);
void percentChanged(int percent);

22
UI/qt-wrappers.cpp
View File

@ -28,6 +28,7 @@
#include <QKeyEvent>
#include <QFileDialog>
#include <QStandardItemModel>
#include <QLabel>
#if !defined(_WIN32) && !defined(__APPLE__)
#include <obs-nix-platform.h>
@ -377,3 +378,24 @@ QStringList OpenFiles(QWidget *parent, QString title, QString path,
return files;
}
static void SetLabelText(QLabel *label, const QString &newText)
{
if (label->text() != newText)
label->setText(newText);
}
void TruncateLabel(QLabel *label, QString &newText, int length)
{
if (newText.length() < length) {
label->setToolTip(QString());
SetLabelText(label, newText);
return;
}
label->setToolTip(newText);
newText.truncate(length);
newText += "...";
SetLabelText(label, newText);
}

5
UI/qt-wrappers.hpp
View File

@ -30,6 +30,7 @@
#define QT_UTF8(str) QString::fromUtf8(str, -1)
#define QT_TO_UTF8(str) str.toUtf8().constData()
#define MAX_LABEL_LENGTH 80
class QDataStream;
class QComboBox;
@ -37,6 +38,7 @@ class QWidget;
class QLayout;
class QString;
struct gs_window;
class QLabel;
class OBSMessageBox {
public:
@ -117,3 +119,6 @@ QString OpenFile(QWidget *parent, QString title, QString path,
QString extensions);
QStringList OpenFiles(QWidget *parent, QString title, QString path,
QString extensions);
void TruncateLabel(QLabel *label, QString &newText,
int length = MAX_LABEL_LENGTH);