flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 23:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #419, reviewed style sheet paintEvent code

Browse Source 
* removed for QWidget
* added for QDialog
http://stackoverflow.com/questions/37952348/enable-own-widget-for-stylesheet
This commit is contained in:
Klaus Basan
2016-06-22 12:07:24 +02:00
parent 2d669e0e21
commit 635410857e
13 changed files with 12 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackgui/components/marginsinput.cpp
View File

@@ -66,13 +66,6 @@ namespace BlackGui
return m;
}
void CMarginsInput::paintEvent(QPaintEvent *event)
{
bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
if (s) { return; }
QFrame::paintEvent(event);
}
void CMarginsInput::ps_Confirmed()
{
const QMargins m(this->getMargins());

4
src/blackgui/components/marginsinput.h
View File

@@ -42,10 +42,6 @@ namespace BlackGui
//! Current values of margins
QMargins getMargins() const;
protected:
//! \copydoc QFrame::paintEvent
virtual void paintEvent(QPaintEvent *event) override;
signals:
//! Margins changed
void changedMargins(const QMargins &margins);

7
src/blackgui/components/navigatordialog.cpp
View File

@@ -152,6 +152,13 @@ namespace BlackGui
this->buildNavigator(this->m_currentColumns);
}
void CNavigatorDialog::paintEvent(QPaintEvent *event)
{
bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
if (s) { return; }
QDialog::paintEvent(event);
}
void CNavigatorDialog::ps_showContextMenu(const QPoint &pos)
{
QPoint globalPos = this->mapToGlobal(pos);

11
src/blackgui/components/navigatordialog.h
View File

@@ -61,17 +61,14 @@ namespace BlackGui
//! Style sheet has changed
void ps_onStyleSheetsChanged();
//! \copydoc QMainWindow::mouseMoveEvent
//! \name Base class events
//! @{
virtual void mouseMoveEvent(QMouseEvent *event) override;
//! \copydoc QMainWindow::mousePressEvent
virtual void mousePressEvent(QMouseEvent *event) override;
//! \copydoc QMainWindow::mousePressEvent
virtual void changeEvent(QEvent *evt) override;
//! \copydoc CEnableForFramelessWindow::windowFlagsChanged
virtual void windowFlagsChanged() override;
virtual void paintEvent(QPaintEvent *event) override;
//! @}
private slots:
//! Context menu

7
src/blackgui/dropsite.cpp
View File

@@ -89,11 +89,4 @@ namespace BlackGui
{
// style sheet changes go here
}
void CDropSite::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
}
} // ns

3
src/blackgui/dropsite.h
View File

@@ -65,9 +65,6 @@ namespace BlackGui
//! \copydoc QWidget::dropEvent
virtual void dropEvent(QDropEvent *event) override;
//! \copydoc QWidget::paintEvent
virtual void paintEvent(QPaintEvent *event) override;
private slots:
//! Style has been changed
void ps_onStyleSheetsChanged();

8
src/blackgui/overlaymessages.cpp
View File

@@ -318,12 +318,4 @@ namespace BlackGui
m_autoCloseTimer.stop();
}
}
void BlackGui::COverlayMessages::paintEvent(QPaintEvent *event)
{
bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
if (s) { return; }
QFrame::paintEvent(event);
}
} // ns

3
src/blackgui/overlaymessages.h
View File

@@ -113,9 +113,6 @@ namespace BlackGui
//! \copydoc QFrame::keyPressEvent
virtual void keyPressEvent(QKeyEvent *event) override;
//! \copydoc QFrame::paintEvent
virtual void paintEvent(QPaintEvent *event) override;
private slots:
//! Stylesheet changed
void ps_onStyleSheetsChanged();

7
src/blackgui/overlaymessagesframe.cpp
View File

@@ -83,13 +83,6 @@ namespace BlackGui
this->repaint();
}
void COverlayMessagesFrame::paintEvent(QPaintEvent *event)
{
bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
if (s) { return; }
QFrame::paintEvent(event);
}
void COverlayMessagesFrame::keyPressEvent(QKeyEvent *event)
{
if (m_overlayMessages && event->key() == Qt::Key_Escape)

3
src/blackgui/overlaymessagesframe.h
View File

@@ -81,9 +81,6 @@ namespace BlackGui
void showOverlayImage(const BlackMisc::CPixmap &pixmap, int timeOutMs = -1);
protected:
//! \copydoc QFrame::paintEvent
virtual void paintEvent(QPaintEvent *event) override;
//! \copydoc QFrame::keyPressEvent
virtual void keyPressEvent(QKeyEvent *event) override;

1
src/blackgui/stylesheetutility.cpp
View File

@@ -361,6 +361,7 @@ namespace BlackGui
// 1) QStylePainter: modern version of
// usedWidget->style()->drawPrimitive(element, &opt, &p, usedWidget);
// 2) With viewport based widgets viewport has to be used
// see http://stackoverflow.com/questions/37952348/enable-own-widget-for-stylesheet
QAbstractScrollArea *sa = qobject_cast<QAbstractScrollArea *>(usedWidget);
QStylePainter p(
sa ? sa->viewport() :

6
src/blackgui/views/viewbase.cpp
View File

@@ -359,12 +359,6 @@ namespace BlackGui
connect(actionInteractiveResize, &QAction::toggled, this, &CViewBaseNonTemplate::ps_toggleResizeMode);
}
void CViewBaseNonTemplate::paintEvent(QPaintEvent *event)
{
QTableView::paintEvent(event);
// CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
}
void CViewBaseNonTemplate::showEvent(QShowEvent *event)
{
if (this->isShowingLoadIndicator())

1
src/blackgui/views/viewbase.h
View File

@@ -321,7 +321,6 @@ namespace BlackGui
//! \name Functions from QTableView
//! @{
virtual void paintEvent(QPaintEvent *event) override;
virtual void showEvent(QShowEvent *event) override;
virtual void dragEnterEvent(QDragEnterEvent *event) override;
virtual void dragMoveEvent(QDragMoveEvent *event) override;