From ae4d7cd5288f23a679b3b2ddc4e66856d4aed5b8 Mon Sep 17 00:00:00 2001 From: JohannMG Date: Wed, 8 Jul 2020 17:00:38 -0700 Subject: [PATCH] UI: Make color consistent, don't show alpha value 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. --- UI/properties-view.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index 6d5a6c1b0..f0159388d 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -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(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));