OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-04 10:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1305 from JustinLove/use-selected-color-in-color-property-label

Browse source 
Use selected color in color property label
This commit is contained in:
Jim 2018-06-17 23:01:25 -07:00 committed by GitHub
parent cd70c2e037 a4b2b6f3bf
commit b8f03791ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
UI/properties-view.cpp
View file

@ -1,4 +1,5 @@
#include <QFormLayout>
#include <QStackedLayout>
#include <QScrollBar>
#include <QLabel>
#include <QCheckBox>
@ -638,17 +639,38 @@ void OBSPropertiesView::AddColor(obs_property_t *prop, QFormLayout *layout,
button->setText(QTStr("Basic.PropertiesWindow.SelectColor"));
button->setToolTip(QT_UTF8(obs_property_long_description(prop)));
QPalette palette = QPalette(color);
colorLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
colorLabel->setText(color.name(QColor::HexArgb));
colorLabel->setPalette(QPalette(color));
colorLabel->setPalette(palette);
colorLabel->setStyleSheet(
QString("background-color :%1; color: %2;")
.arg(palette.color(QPalette::Window).name(QColor::HexArgb))
.arg(palette.color(QPalette::WindowText).name(QColor::HexArgb)));
colorLabel->setAutoFillBackground(true);
colorLabel->setAlignment(Qt::AlignCenter);
colorLabel->setToolTip(QT_UTF8(obs_property_long_description(prop)));
QFrame *backdrop = new QLabel;
backdrop->setFrameStyle(QFrame::Sunken | QFrame::Panel);
backdrop->setPalette(palette);
backdrop->setStyleSheet(
"background: qlineargradient(x1:0, y1:0, x2:1, y2:1,"
"stop:0 #cccccc, stop:0.45 #cccccc,"
"stop:0.55 #444444, stop:1 #444444)");
backdrop->setAutoFillBackground(true);
QStackedLayout *stackLayout = new QStackedLayout;
stackLayout->setContentsMargins(0, 0, 0, 0);
stackLayout->setStackingMode(QStackedLayout::StackAll);
stackLayout->addWidget(backdrop);
stackLayout->addWidget(colorLabel);
QHBoxLayout *subLayout = new QHBoxLayout;
subLayout->setContentsMargins(0, 0, 0, 0);
subLayout->addWidget(colorLabel);
subLayout->addItem(stackLayout);
subLayout->addWidget(button);
WidgetInfo *info = new WidgetInfo(this, prop, colorLabel);
@ -1636,7 +1658,12 @@ bool WidgetInfo::ColorChanged(const char *setting)
QLabel *label = static_cast<QLabel*>(widget);
label->setText(color.name(QColor::HexArgb));
label->setPalette(QPalette(color));
QPalette palette = QPalette(color);
label->setPalette(palette);
label->setStyleSheet(
QString("background-color :%1; color: %2;")
.arg(palette.color(QPalette::Window).name(QColor::HexArgb))
.arg(palette.color(QPalette::WindowText).name(QColor::HexArgb)));
obs_data_set_int(view->settings, setting, color_to_int(color));