mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #1882 from cg2121/hotkey-theme-issues

Browse Source 
UI: Fix hotkey theme issues
This commit is contained in:
Jim 2019-05-14 02:30:04 -07:00 committed by GitHub
commit eac7cb5cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
UI/data/themes/Dark.qss
View File

@ -357,11 +357,6 @@ QLineEdit, QTextEdit, QPlainTextEdit {
padding: 2px 2px 3px 7px;
}
OBSHotkeyWidget QLineEdit {
margin: 0px 3px 0px 0px;
}
/* Spinbox and doubleSpinbox */
QSpinBox, QDoubleSpinBox {
@ -459,10 +454,6 @@ QPushButton::menu-indicator {
width: 25px;
}
QPushButton[themeID="hotkeyButtons"] {
margin: 1px 2px;
}
/* Sliders */
QSlider::groove:horizontal {

37
UI/data/themes/Rachni.qss
View File

@ -969,6 +969,8 @@ QPushButton:checked#exitButton {
QPushButton[themeID="addIconSmall"],
QPushButton[themeID="removeIconSmall"],
QPushButton[themeID="configIconSmall"],
QPushButton[themeID="trashIcon"],
QPushButton[themeID="revertIcon"],
QPushButton#transitionRemove,
QPushButton#moveAsyncFilterUp,
QPushButton#moveAsyncFilterDown,
@ -982,6 +984,8 @@ QPushButton#moveEffectFilterUp {
QPushButton:hover[themeID="addIconSmall"],
QPushButton:hover[themeID="removeIconSmall"],
QPushButton:hover[themeID="configIconSmall"],
QPushButton:hover[themeID="trashIcon"],
QPushButton:hover[themeID="revertIcon"],
QPushButton:hover#transitionRemove,
QPushButton:hover#moveAsyncFilterUp,
QPushButton:hover#moveAsyncFilterDown,
@ -995,39 +999,6 @@ QPushButton:hover#moveEffectFilterUp {
outline: none;
}
/******************************/
/* --- Hotkey Buttons --- */
/******************************/
/* Fix for the hotkey buttons */
/* looking terrible with my */
/* color choices. */
/******************************/
QPushButton[themeID="hotkeyButtons"] {
background-color: rgb(58, 64, 69); /* Light Blue-gray */
color: rgb(239, 240, 241); /* White */
border-radius: 2px;
border: none;
margin: 4px;
padding-top: 6px;
padding-bottom: 6px;
}
QPushButton:hover[themeID="hotkeyButtons"] {
background-color: rgba(240, 98, 146, 0.5); /* Pink (Secondary) */
border: 1px solid rgba(240, 98, 146, 0.5); /* Pink (Secondary) */
}
QPushButton:pressed[themeID="hotkeyButtons"] {
background-color: rgb(240, 98, 146); /* Pink (Secondary) */
border: 1px solid rgb(240, 98, 146); /* Pink (Secondary) */
}
QPushButton:disabled[themeID="hotkeyButtons"] {
background-color: rgb(58, 64, 69); /* Light Blue-gray */
color: rgb(162, 161, 162); /* Lighter Gray */
}
/******************/
/* --- Labels --- */
/******************/

1
UI/hotkey-edit.cpp
View File

@ -324,6 +324,7 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx)
});
QHBoxLayout *subLayout = new QHBoxLayout;
subLayout->setContentsMargins(0, 4, 0, 0);
subLayout->addWidget(edit);
subLayout->addWidget(revert);
subLayout->addWidget(clear);