update for DWM QtWinExtras on PictureDialog
This commit is contained in:
parent
c7b0a8917e
commit
833bb90e4a
2 changed files with 36 additions and 10 deletions
|
@ -30,6 +30,7 @@
|
||||||
#ifdef GTA5SYNC_WIN
|
#ifdef GTA5SYNC_WIN
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
#include <QtWinExtras/QtWin>
|
#include <QtWinExtras/QtWin>
|
||||||
|
#include <QWinEvent>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -100,8 +101,6 @@ void PictureDialog::addPreviousNextButtons()
|
||||||
// Windows Vista additions
|
// Windows Vista additions
|
||||||
#ifdef GTA5SYNC_WIN
|
#ifdef GTA5SYNC_WIN
|
||||||
#if QT_VERSION >= 0x050000
|
#if QT_VERSION >= 0x050000
|
||||||
if (QtWin::isCompositionEnabled())
|
|
||||||
{
|
|
||||||
QPalette palette;
|
QPalette palette;
|
||||||
QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this);
|
QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this);
|
||||||
layout()->setMenuBar(uiToolbar);
|
layout()->setMenuBar(uiToolbar);
|
||||||
|
@ -109,15 +108,40 @@ void PictureDialog::addPreviousNextButtons()
|
||||||
QAction *nextAction = uiToolbar->addAction("->", this, SLOT(nextPictureRequestedSlot()));
|
QAction *nextAction = uiToolbar->addAction("->", this, SLOT(nextPictureRequestedSlot()));
|
||||||
backAction->setToolTip("");
|
backAction->setToolTip("");
|
||||||
nextAction->setToolTip("");
|
nextAction->setToolTip("");
|
||||||
|
ui->jsonFrame->setStyleSheet(QString("QFrame { background: %1; }").arg(palette.window().color().name()));
|
||||||
|
stylize();
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
QtWin::extendFrameIntoClientArea(this, 0, uiToolbar->height() - 2, 0, 0);
|
void PictureDialog::stylize()
|
||||||
|
{
|
||||||
|
if (QtWin::isCompositionEnabled())
|
||||||
|
{
|
||||||
|
//qDebug() << this->layout()->menuBar()->height();
|
||||||
|
QtWin::extendFrameIntoClientArea(this, 0, this->layout()->menuBar()->height() - 2, 0, 0);
|
||||||
setAttribute(Qt::WA_TranslucentBackground, true);
|
setAttribute(Qt::WA_TranslucentBackground, true);
|
||||||
setAttribute(Qt::WA_NoSystemBackground, false);
|
setAttribute(Qt::WA_NoSystemBackground, false);
|
||||||
setStyleSheet("PictureDialog { background: transparent; }");
|
setStyleSheet("PictureDialog { background: transparent; }");
|
||||||
ui->jsonFrame->setStyleSheet(QString("QFrame { background: %1; }").arg(palette.window().color().name()));
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
QtWin::resetExtendedFrame(this);
|
||||||
|
setAttribute(Qt::WA_TranslucentBackground, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PictureDialog::event(QEvent *event)
|
||||||
|
{
|
||||||
|
#ifdef GTA5SYNC_WIN
|
||||||
|
#if QT_VERSION >= 0x050000
|
||||||
|
if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange)
|
||||||
|
{
|
||||||
|
stylize();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
return QDialog::event(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PictureDialog::nextPictureRequestedSlot()
|
void PictureDialog::nextPictureRequestedSlot()
|
||||||
|
|
|
@ -63,6 +63,7 @@ private slots:
|
||||||
void exportCustomContextMenuRequestedPrivate(const QPoint &pos, bool fullscreen);
|
void exportCustomContextMenuRequestedPrivate(const QPoint &pos, bool fullscreen);
|
||||||
void nextPictureRequestedSlot();
|
void nextPictureRequestedSlot();
|
||||||
void previousPictureRequestedSlot();
|
void previousPictureRequestedSlot();
|
||||||
|
void stylize();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void nextPictureRequested();
|
void nextPictureRequested();
|
||||||
|
@ -72,6 +73,7 @@ signals:
|
||||||
protected:
|
protected:
|
||||||
bool eventFilter(QObject *obj, QEvent *ev);
|
bool eventFilter(QObject *obj, QEvent *ev);
|
||||||
void mousePressEvent(QMouseEvent *ev);
|
void mousePressEvent(QMouseEvent *ev);
|
||||||
|
bool event(QEvent *event);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ProfileDatabase *profileDB;
|
ProfileDatabase *profileDB;
|
||||||
|
|
Loading…
Reference in a new issue