OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3140 from JohannMG/fix-rgb-colorpicker

Browse source 
UI: Make color display, don't show alpha value in color label
This commit is contained in:
Jim 2020-07-10 20:35:22 -07:00 committed by GitHub
parent 04e01458e5 ae4d7cd528
commit 2e9d6141ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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));