ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12271 from TryTwo/Qt_Display_Fixes 

UI, CodeDiffDialog: Fix table widget display issues, including dark style.
This commit is contained in:
Admiral H. Curtiss 2023-11-05 12:53:45 +01:00 committed by GitHub
parent b7b8f46832 2a5147a19b
commit 9d08c8a45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/Debugger/CodeDiffDialog.cpp
View File

@ -32,9 +32,9 @@
#include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
static const QString RECORD_BUTTON_STYLESHEET = static const QString RECORD_BUTTON_STYLESHEET = QStringLiteral(
QStringLiteral("QPushButton:checked { background-color: rgb(150, 0, 0); border-style: solid; " "QPushButton:checked { background-color: rgb(150, 0, 0); border-style: solid;"
"border-width: 3px; border-color: rgb(150,0,0); color: rgb(255, 255, 255);}"); "padding: 0px; border-width: 3px; border-color: rgb(150,0,0); color: rgb(255, 255, 255);}");
CodeDiffDialog::CodeDiffDialog(CodeWidget* parent) : QDialog(parent), m_code_widget(parent) CodeDiffDialog::CodeDiffDialog(CodeWidget* parent) : QDialog(parent), m_code_widget(parent)
{ {
@ -61,7 +61,6 @@ void CodeDiffDialog::CreateWidgets()
m_record_btn = new QPushButton(tr("Start Recording")); m_record_btn = new QPushButton(tr("Start Recording"));
m_record_btn->setCheckable(true); m_record_btn->setCheckable(true);
m_record_btn->setStyleSheet(RECORD_BUTTON_STYLESHEET); m_record_btn->setStyleSheet(RECORD_BUTTON_STYLESHEET);
m_exclude_btn->setEnabled(false); m_exclude_btn->setEnabled(false);
m_include_btn->setEnabled(false); m_include_btn->setEnabled(false);
@ -89,6 +88,7 @@ void CodeDiffDialog::CreateWidgets()
m_matching_results_table->setColumnWidth(2, 4); m_matching_results_table->setColumnWidth(2, 4);
m_matching_results_table->setColumnWidth(3, 210); m_matching_results_table->setColumnWidth(3, 210);
m_matching_results_table->setColumnWidth(4, 65); m_matching_results_table->setColumnWidth(4, 65);
m_matching_results_table->setCornerButtonEnabled(false);
m_reset_btn = new QPushButton(tr("Reset All")); m_reset_btn = new QPushButton(tr("Reset All"));
m_reset_btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); m_reset_btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_help_btn = new QPushButton(tr("Help")); m_help_btn = new QPushButton(tr("Help"));

24
Source/Core/DolphinQt/Styles/Dark/dark.qss
View File

@ -82,19 +82,20 @@ QColumnView::item:focus, QListView::item:focus, QTableView::item:focus, QTableWi
background-color: #606060; background-color: #606060;
} }
*/ */
/*
Qt is extremely convinced that the sort arrow belongs on the right side
of the header and will reserve space for it there. The padding is to deal with this fact.
*/
QHeaderView::section { QHeaderView::section {
background-color: #202020; background-color: #202020;
border: 0px; border: 0px;
border-right: 1px solid #7e7e7e; border-right: 1px solid #7e7e7e;
padding: 0px; padding-right: -10px;
text-align: right; }
QHeaderView::section::vertical {
/*
this is a hack, Qt is extremely convinced that the sort arrow belongs on the right side
of the header and will reserve space for it there. so this applies that same space to the left
so the text is still centered correctly.
*/
padding-left: 10px; padding-left: 10px;
padding-right: 0px;
} }
QHeaderView::section:last { QHeaderView::section:last {
border-right: 0px; border-right: 0px;
@ -485,3 +486,10 @@ QTabBar QToolButton::left-arrow {
QTabBar QToolButton::right-arrow { QTabBar QToolButton::right-arrow {
image: url(:/dolphin_dark_win/right-triangle-tabbar.svg); image: url(:/dolphin_dark_win/right-triangle-tabbar.svg);
} }
QTableCornerButton::section {
background-color: #202020;
border: 1px solid #7e7e7e;
border-top: 0px;
border-left: 0px;
border-bottom: 0px;
}