Fix stylesheet/palette gotcha on AllPlot

.. mucked up the reset of the palettes for all
   the widgets when setting the stylesheet for
   the scrollareas.
This commit is contained in:
Mark Liversedge
2014-05-26 20:50:31 +01:00
parent f77fee2e9b
commit 3178cf4cc2

View File

@@ -618,6 +618,14 @@ AllPlotWindow::configChanged()
palette.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
setPalette(palette); // propagates to children
// set style sheets
#ifndef Q_OS_MAC
allPlotFrame->setStyleSheet(TabView::ourStyleSheet());
comparePlotFrame->setStyleSheet(TabView::ourStyleSheet());
seriesstackFrame->setStyleSheet(TabView::ourStyleSheet());
stackFrame->setStyleSheet(TabView::ourStyleSheet());
#endif
// set palettes
allStack->setPalette(palette);
allPlotStack->setPalette(palette);
@@ -634,13 +642,6 @@ AllPlotWindow::configChanged()
scrollLeft->setPalette(palette);
scrollRight->setPalette(palette);
// set style sheets
#ifndef Q_OS_MAC
allPlotFrame->setStyleSheet(TabView::ourStyleSheet());
comparePlotFrame->setStyleSheet(TabView::ourStyleSheet());
seriesstackFrame->setStyleSheet(TabView::ourStyleSheet());
stackFrame->setStyleSheet(TabView::ourStyleSheet());
#endif
fullPlot->setCanvasBackground(GColor(CRIDEPLOTBACKGROUND));
fullPlot->setPalette(palette);