From 9b3e0176dc45de23edbb29d6603fee4bde2b9537 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 4 Oct 2016 19:47:41 +0200 Subject: [PATCH] Pass clicked event from resource preview members to signal --- qrenderdoc/Widgets/ResourcePreview.cpp | 10 ++++++++++ qrenderdoc/Widgets/ResourcePreview.h | 6 ++++++ qrenderdoc/Widgets/ResourcePreview.ui | 8 ++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Widgets/ResourcePreview.cpp b/qrenderdoc/Widgets/ResourcePreview.cpp index 96a81947c..44d1962da 100644 --- a/qrenderdoc/Widgets/ResourcePreview.cpp +++ b/qrenderdoc/Widgets/ResourcePreview.cpp @@ -23,6 +23,7 @@ ******************************************************************************/ #include "ResourcePreview.h" +#include #include "ui_ResourcePreview.h" ResourcePreview::ResourcePreview(CaptureContext *c, IReplayOutput *output, QWidget *parent) @@ -43,6 +44,10 @@ ResourcePreview::ResourcePreview(CaptureContext *c, IReplayOutput *output, QWidg ui->slotLabel->setPalette(Pal); ui->descriptionLabel->setAutoFillBackground(true); ui->descriptionLabel->setPalette(Pal); + + QObject::connect(ui->thumbnail, &CustomPaintWidget::clicked, this, &ResourcePreview::clickEvent); + QObject::connect(ui->slotLabel, &RDLabel::clicked, this, &ResourcePreview::clickEvent); + QObject::connect(ui->descriptionLabel, &RDLabel::clicked, this, &ResourcePreview::clickEvent); } ResourcePreview::~ResourcePreview() @@ -50,6 +55,11 @@ ResourcePreview::~ResourcePreview() delete ui; } +void ResourcePreview::clickEvent(QMouseEvent *e) +{ + emit clicked(e); +} + void ResourcePreview::setSlotName(const QString &n) { ui->slotLabel->setText(n); diff --git a/qrenderdoc/Widgets/ResourcePreview.h b/qrenderdoc/Widgets/ResourcePreview.h index 04aa152ef..2983281cd 100644 --- a/qrenderdoc/Widgets/ResourcePreview.h +++ b/qrenderdoc/Widgets/ResourcePreview.h @@ -43,9 +43,15 @@ public: explicit ResourcePreview(CaptureContext *c, IReplayOutput *output, QWidget *parent = 0); ~ResourcePreview(); +signals: + void clicked(QMouseEvent *e); + +public: void setSlotName(const QString &n); void setResourceName(const QString &n); + void clickEvent(QMouseEvent *e); + WId thumbWinId(); void setActive(bool b) diff --git a/qrenderdoc/Widgets/ResourcePreview.ui b/qrenderdoc/Widgets/ResourcePreview.ui index 0220417e8..346359923 100644 --- a/qrenderdoc/Widgets/ResourcePreview.ui +++ b/qrenderdoc/Widgets/ResourcePreview.ui @@ -24,7 +24,7 @@ - 160 + 178 120 @@ -75,7 +75,7 @@ - + 0 0 @@ -94,10 +94,10 @@ - 1 + PS RW16 - 6 + 1