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

UI: Make color consistent, don't show alpha value

Browse Source 
The color picker loads the label not showing alpha hex value but on
color change then shows the alpha level in the hex value (which is
hardcoded to 255).

This changes so the label always shows only RGB value.

Of course, can be easily changed back to ::Arbg later if a alpha picker
is added.
This commit is contained in:
JohannMG 2020-07-08 17:00:38 -07:00
parent f23d04b67f
commit ae4d7cd528
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
UI/properties-view.cpp
View File

@ -657,14 +657,15 @@ void OBSPropertiesView::AddColor(obs_property_t *prop, QFormLayout *layout,
QPalette palette = QPalette(color);
colorLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
// The picker doesn't have an alpha option, show only RGB
colorLabel->setText(color.name(QColor::HexRgb));
colorLabel->setPalette(palette);
colorLabel->setStyleSheet(
QString("background-color :%1; color: %2;")
.arg(palette.color(QPalette::Window)
.name(QColor::HexArgb))
.name(QColor::HexRgb))
.arg(palette.color(QPalette::WindowText)
.name(QColor::HexArgb)));
.name(QColor::HexRgb)));
colorLabel->setAutoFillBackground(true);
colorLabel->setAlignment(Qt::AlignCenter);
colorLabel->setToolTip(QT_UTF8(obs_property_long_description(prop)));
@ -1710,14 +1711,14 @@ bool WidgetInfo::ColorChanged(const char *setting)
return false;
QLabel *label = static_cast<QLabel *>(widget);
label->setText(color.name(QColor::HexArgb));
label->setText(color.name(QColor::HexRgb));
QPalette palette = QPalette(color);
label->setPalette(palette);
label->setStyleSheet(QString("background-color :%1; color: %2;")
.arg(palette.color(QPalette::Window)
.name(QColor::HexArgb))
.name(QColor::HexRgb))
.arg(palette.color(QPalette::WindowText)
.name(QColor::HexArgb)));
.name(QColor::HexRgb)));
obs_data_set_int(view->settings, setting, color_to_int(color));