diff --git a/qrenderdoc/Styles/RDStyle/RDStyle.cpp b/qrenderdoc/Styles/RDStyle/RDStyle.cpp
index 3029b9acb..d12a50863 100644
--- a/qrenderdoc/Styles/RDStyle/RDStyle.cpp
+++ b/qrenderdoc/Styles/RDStyle/RDStyle.cpp
@@ -188,7 +188,7 @@ QRect RDStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
// return the normal rect if there's no menu
if(!(toolbutton->subControls & SC_ToolButtonMenu) &&
- !(toolbutton->features & QStyleOptionToolButton::HasMenu))
+ !(toolbutton->features & QStyleOptionToolButton::MenuButtonPopup))
{
return ret;
}
diff --git a/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp b/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp
index 768ebadb0..fdd495db4 100644
--- a/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp
+++ b/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp
@@ -132,7 +132,7 @@ void RDTweakedNativeStyle::drawComplexControl(ComplexControl control, const QSty
// draw the menu arrow, if there is one
if((toolbutton->subControls & SC_ToolButtonMenu) ||
- (toolbutton->features & QStyleOptionToolButton::HasMenu))
+ (toolbutton->features & QStyleOptionToolButton::MenuButtonPopup))
{
QStyleOptionToolButton menu = *toolbutton;
menu.rect = subControlRect(control, opt, SC_ToolButtonMenu, widget);
diff --git a/qrenderdoc/Widgets/BufferFormatSpecifier.ui b/qrenderdoc/Widgets/BufferFormatSpecifier.ui
index ff445fcff..15d01c945 100644
--- a/qrenderdoc/Widgets/BufferFormatSpecifier.ui
+++ b/qrenderdoc/Widgets/BufferFormatSpecifier.ui
@@ -131,14 +131,48 @@ Vectors (e.g. float4), matrices ([row_major] half3x4) and arrays (float[16]) are
0
+
+
+
+
+
+
+ 170
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 170
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 106
+ 104
+ 100
+
+
+
+
+
+
14
-
- color: rgb(171, 32, 32);
-
diff --git a/qrenderdoc/Windows/Dialogs/AboutDialog.ui b/qrenderdoc/Windows/Dialogs/AboutDialog.ui
index 11864caf6..29a4c2321 100644
--- a/qrenderdoc/Windows/Dialogs/AboutDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/AboutDialog.ui
@@ -31,8 +31,99 @@
-
-
- background-color: #3bb779;
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 59
+ 183
+ 121
+
+
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 59
+ 183
+ 121
+
+
+
+
+
+
+
+
+ 106
+ 104
+ 100
+
+
+
+
+
+
+ 59
+ 183
+ 121
+
+
+
+
+
+
+ 59
+ 183
+ 121
+
+
+
+
+
+
+
+ true
@@ -43,14 +134,18 @@
-
+
+
+
+
+
+
+
36
-
- color: #fff;
-
RenderDoc
diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
index 32c015095..738eca46a 100644
--- a/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
+++ b/qrenderdoc/Windows/Dialogs/LiveCapture.cpp
@@ -160,10 +160,6 @@ LiveCapture::LiveCapture(ICaptureContext &ctx, const QString &hostname, const QS
QObject::connect(ui->captures, &RDListWidget::keyPress, this, &LiveCapture::captures_keyPress);
ui->mainLayout->addWidget(bottomTools);
-
- bottomTools->setStyleSheet(
- lit("background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
- "stop: 0 #E1E1E1, stop: 1.0 #D3D3D3);"));
}
}
diff --git a/qrenderdoc/Windows/Dialogs/TipsDialog.ui b/qrenderdoc/Windows/Dialogs/TipsDialog.ui
index 3376c111f..e714d2573 100644
--- a/qrenderdoc/Windows/Dialogs/TipsDialog.ui
+++ b/qrenderdoc/Windows/Dialogs/TipsDialog.ui
@@ -63,9 +63,6 @@
9
-
-
-
Tip #X
@@ -91,9 +88,6 @@
16
-
-
-
Tip #X: Tip Title
@@ -123,9 +117,6 @@
12
-
-
-
TextLabel
@@ -158,9 +149,6 @@
10
-
-
-
https://renderdoc.org/tips/1
diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index 32109c419..f3b59fdb4 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -156,6 +156,9 @@ EventBrowser::EventBrowser(ICaptureContext &ctx, QWidget *parent)
OnLogfileClosed();
+ m_redPalette = palette();
+ m_redPalette.setColor(QPalette::Base, Qt::red);
+
m_Ctx.AddLogViewer(this);
}
@@ -422,7 +425,7 @@ void EventBrowser::on_HideFindJump()
ui->jumpToEID->setText(QString());
ClearFindIcons();
- ui->findEvent->setStyleSheet(QString());
+ ui->findEvent->setPalette(palette());
}
void EventBrowser::on_jumpToEID_returnPressed()
@@ -442,9 +445,9 @@ void EventBrowser::findHighlight_timeout()
int results = SetFindIcons(ui->findEvent->text());
if(results > 0)
- ui->findEvent->setStyleSheet(QString());
+ ui->findEvent->setPalette(palette());
else
- ui->findEvent->setStyleSheet(lit("QLineEdit{background-color:#ff0000;}"));
+ ui->findEvent->setPalette(m_redPalette);
}
void EventBrowser::on_findEvent_textEdited(const QString &arg1)
@@ -453,7 +456,7 @@ void EventBrowser::on_findEvent_textEdited(const QString &arg1)
{
m_FindHighlight->stop();
- ui->findEvent->setStyleSheet(QString());
+ ui->findEvent->setPalette(palette());
ClearFindIcons();
}
else
@@ -1187,7 +1190,7 @@ void EventBrowser::Find(bool forward)
if(eid >= 0)
{
SelectEvent((uint32_t)eid);
- ui->findEvent->setStyleSheet(QString());
+ ui->findEvent->setPalette(palette());
}
else // if(WrapSearch)
{
@@ -1195,11 +1198,11 @@ void EventBrowser::Find(bool forward)
if(eid >= 0)
{
SelectEvent((uint32_t)eid);
- ui->findEvent->setStyleSheet(QString());
+ ui->findEvent->setPalette(palette());
}
else
{
- ui->findEvent->setStyleSheet(lit("QLineEdit{background-color:#ff0000;}"));
+ ui->findEvent->setPalette(m_redPalette);
}
}
}
diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h
index fd82abb12..cc3501a20 100644
--- a/qrenderdoc/Windows/EventBrowser.h
+++ b/qrenderdoc/Windows/EventBrowser.h
@@ -125,6 +125,8 @@ private:
void ExportDrawcall(QTextStream &writer, int maxNameLength, int indent, bool firstchild,
const DrawcallDescription &drawcall);
+ QPalette m_redPalette;
+
TimeUnit m_TimeUnit = TimeUnit::Count;
rdctype::array m_Times;
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index 07abbdde3..a7df0be84 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -109,7 +109,6 @@ MainWindow::MainWindow(ICaptureContext &ctx) : QMainWindow(NULL), ui(new Ui::Mai
contextChooser->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
contextChooser->setPopupMode(QToolButton::InstantPopup);
contextChooser->setMenu(contextChooserMenu);
- contextChooser->setStyleSheet(lit("QToolButton::menu-indicator { image: none; }"));
contextChooser->setContextMenuPolicy(Qt::DefaultContextMenu);
QObject::connect(contextChooserMenu, &QMenu::aboutToShow, this,
&MainWindow::contextChooser_menuShowing);
@@ -158,8 +157,6 @@ MainWindow::MainWindow(ICaptureContext &ctx) : QMainWindow(NULL), ui(new Ui::Mai
});
m_RemoteProbe->start();
- ui->statusBar->setStyleSheet(lit("QStatusBar::item { border: 0px }"));
-
SetTitle();
PopulateRecentFiles();
diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
index 110fcbc20..f81d358d9 100644
--- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
+++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.ui
@@ -446,12 +446,48 @@
-
+
+
+
+
+
+
+ 170
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 170
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 106
+ 104
+ 100
+
+
+
+
+
+
PointingHandCursor
-
- color: red;
-border: 1px solid black;
+
+ QFrame::Box
Mismatch of Input Layout and Vertex Shader signatures
diff --git a/qrenderdoc/Windows/PixelHistoryView.ui b/qrenderdoc/Windows/PixelHistoryView.ui
index c78afae19..6b462fa88 100644
--- a/qrenderdoc/Windows/PixelHistoryView.ui
+++ b/qrenderdoc/Windows/PixelHistoryView.ui
@@ -40,8 +40,42 @@ Right click to debug an event, hide failed events, or jump to the modification's
-
-
- color: #f00;
+
+
+
+
+
+
+ 200
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 200
+ 0
+ 0
+
+
+
+
+
+
+
+
+ 106
+ 104
+ 100
+
+
+
+
+
Failed events are currently hidden