mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: revert paintEvent changes, only keep one for ShaderParamsDialog

Browse Source
This commit is contained in:
Brad Parker 2018-08-19 19:27:06 -04:00
parent 8380ad61f9
commit 3ad54bc9ca
6 changed files with 13 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ui/drivers/qt/shaderparamsdialog.cpp
View File

@ -91,6 +91,19 @@ void ShaderParamsDialog::closeEvent(QCloseEvent *event)
emit closed(); emit closed();
} }
void ShaderParamsDialog::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QDialog::paintEvent(event);
}
QString ShaderParamsDialog::getFilterLabel(unsigned filter) QString ShaderParamsDialog::getFilterLabel(unsigned filter)
{ {
QString filterString; QString filterString;
@ -1153,16 +1166,3 @@ void ShaderParamsDialog::onShaderParamDoubleSpinBoxValueChanged(double value)
} }
} }
} }
void ShaderParamsDialog::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QDialog::paintEvent(event);
}

1
ui/drivers/qt/shaderparamsdialog.h
View File

@ -5,7 +5,6 @@
class QCloseEvent; class QCloseEvent;
class QResizeEvent; class QResizeEvent;
class QPaintEvent;
class QVBoxLayout; class QVBoxLayout;
class QFormLayout; class QFormLayout;
class QLayout; class QLayout;

78
ui/drivers/qt/ui_qt_window.cpp
View File

@ -191,19 +191,6 @@ void TreeView::selectionChanged(const QItemSelection &selected, const QItemSelec
emit itemsSelected(list); emit itemsSelected(list);
} }
void TreeView::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QTreeView::paintEvent(event);
}
TableWidget::TableWidget(QWidget *parent) : TableWidget::TableWidget(QWidget *parent) :
QTableWidget(parent) QTableWidget(parent)
{ {
@ -225,38 +212,12 @@ void TableWidget::keyPressEvent(QKeyEvent *event)
QTableWidget::keyPressEvent(event); QTableWidget::keyPressEvent(event);
} }
void TableWidget::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QTableWidget::paintEvent(event);
}
CoreInfoLabel::CoreInfoLabel(QString text, QWidget *parent) : CoreInfoLabel::CoreInfoLabel(QString text, QWidget *parent) :
QLabel(text, parent) QLabel(text, parent)
{ {
setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
} }
void CoreInfoLabel::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QLabel::paintEvent(event);
}
CoreInfoWidget::CoreInfoWidget(CoreInfoLabel *label, QWidget *parent) : CoreInfoWidget::CoreInfoWidget(CoreInfoLabel *label, QWidget *parent) :
QWidget(parent) QWidget(parent)
,m_label(label) ,m_label(label)
@ -277,19 +238,6 @@ void CoreInfoWidget::resizeEvent(QResizeEvent *event)
m_scrollArea->resize(event->size()); m_scrollArea->resize(event->size());
} }
void CoreInfoWidget::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QWidget::paintEvent(event);
}
LogTextEdit::LogTextEdit(QWidget *parent) : LogTextEdit::LogTextEdit(QWidget *parent) :
QPlainTextEdit(parent) QPlainTextEdit(parent)
{ {
@ -305,19 +253,6 @@ void LogTextEdit::appendMessage(const QString& text)
verticalScrollBar()->setValue(verticalScrollBar()->maximum()); verticalScrollBar()->setValue(verticalScrollBar()->maximum());
} }
void LogTextEdit::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QPlainTextEdit::paintEvent(event);
}
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent) QMainWindow(parent)
,m_loadCoreWindow(new LoadCoreWindow(this)) ,m_loadCoreWindow(new LoadCoreWindow(this))
@ -3012,19 +2947,6 @@ void MainWindow::onShowInfoMessage(QString msg)
showMessageBox(msg, MainWindow::MSGBOX_TYPE_INFO, Qt::ApplicationModal, false); showMessageBox(msg, MainWindow::MSGBOX_TYPE_INFO, Qt::ApplicationModal, false);
} }
void MainWindow::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QMainWindow::paintEvent(event);
}
static void* ui_window_qt_init(void) static void* ui_window_qt_init(void)
{ {
ui_window.qtWindow = new MainWindow(); ui_window.qtWindow = new MainWindow();

13
ui/drivers/qt/viewoptionsdialog.cpp
View File

@ -10,7 +10,6 @@
#include <QFileDialog> #include <QFileDialog>
#include <QApplication> #include <QApplication>
#include <QColorDialog> #include <QColorDialog>
#include <QPainter>
#include "viewoptionsdialog.h" #include "viewoptionsdialog.h"
#include "../ui_qt.h" #include "../ui_qt.h"
@ -217,15 +216,3 @@ void ViewOptionsDialog::hideDialog()
reject(); reject();
} }
void ViewOptionsDialog::paintEvent(QPaintEvent *event)
{
QStyleOption o;
QPainter p;
o.initFrom(this);
p.begin(this);
style()->drawPrimitive(
QStyle::PE_Widget, &o, &p, this);
p.end();
QDialog::paintEvent(event);
}

2
ui/drivers/qt/viewoptionsdialog.h
View File

@ -44,8 +44,6 @@ private:
QCheckBox *m_suggestLoadedCoreFirstCheckBox; QCheckBox *m_suggestLoadedCoreFirstCheckBox;
QSpinBox *m_allPlaylistsListMaxCountSpinBox; QSpinBox *m_allPlaylistsListMaxCountSpinBox;
QSpinBox *m_allPlaylistsGridMaxCountSpinBox; QSpinBox *m_allPlaylistsGridMaxCountSpinBox;
protected:
void paintEvent(QPaintEvent *event);
}; };
#endif #endif

10
ui/drivers/ui_qt.h
View File

@ -153,8 +153,6 @@ signals:
protected slots: protected slots:
void columnCountChanged(int oldCount, int newCount); void columnCountChanged(int oldCount, int newCount);
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
protected:
void paintEvent(QPaintEvent *event);
}; };
class TableWidget : public QTableWidget class TableWidget : public QTableWidget
@ -167,8 +165,6 @@ signals:
void deletePressed(); void deletePressed();
protected: protected:
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event);
protected:
void paintEvent(QPaintEvent *event);
}; };
class AppHandler : public QObject class AppHandler : public QObject
@ -190,8 +186,6 @@ class CoreInfoLabel : public QLabel
Q_OBJECT Q_OBJECT
public: public:
CoreInfoLabel(QString text = QString(), QWidget *parent = 0); CoreInfoLabel(QString text = QString(), QWidget *parent = 0);
protected:
void paintEvent(QPaintEvent *event);
}; };
class CoreInfoWidget : public QWidget class CoreInfoWidget : public QWidget
@ -202,7 +196,6 @@ public:
QSize sizeHint() const; QSize sizeHint() const;
protected: protected:
void resizeEvent(QResizeEvent *event); void resizeEvent(QResizeEvent *event);
void paintEvent(QPaintEvent *event);
private: private:
CoreInfoLabel *m_label; CoreInfoLabel *m_label;
QScrollArea *m_scrollArea; QScrollArea *m_scrollArea;
@ -215,8 +208,6 @@ public:
LogTextEdit(QWidget *parent = 0); LogTextEdit(QWidget *parent = 0);
public slots: public slots:
void appendMessage(const QString& text); void appendMessage(const QString& text);
protected:
void paintEvent(QPaintEvent *event);
}; };
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
@ -459,7 +450,6 @@ private:
protected: protected:
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event);
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event);
void paintEvent(QPaintEvent *event);
}; };
Q_DECLARE_METATYPE(ThumbnailWidget) Q_DECLARE_METATYPE(ThumbnailWidget)