From 3a6b421ef02d7defbc6207fdd8fe7fa5608fa2bc Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Fri, 31 Dec 2010 00:09:43 +0000 Subject: In ctrl canvas, draw the grid before anything else --- muse2/ChangeLog | 1 + muse2/muse/ctrl/ctrlcanvas.cpp | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 991b5390..803419d9 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -7,6 +7,7 @@ these settable colours. *Fixed: Appearance settings palette was broken. (Tim) Note: A few odd Qt styles are wacky (Motif, Windows). Your mileage may vary. + - In ctrl canvas, draw the grid before anything else. (Orcan) 29.12.2010: - Fixed Bigtime display when using a style sheet for MusE. (Tim) Set window font using a style sheet. Bigtime used QFont::setPixelSize(). diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp index bf943173..0eb51363 100644 --- a/muse2/muse/ctrl/ctrlcanvas.cpp +++ b/muse2/muse/ctrl/ctrlcanvas.cpp @@ -1389,6 +1389,13 @@ void CtrlCanvas::pdraw(QPainter& p, const QRect& rect) int w = rect.width() + 2; int h = rect.height(); + //--------------------------------------------------- + // draw the grid + //--------------------------------------------------- + + p.save(); + View::pdraw(p, rect); + p.restore(); //--------------------------------------------------- // draw Canvas Items @@ -1412,10 +1419,6 @@ void CtrlCanvas::pdraw(QPainter& p, const QRect& rect) pdrawItems(p, rect, curPart, true, true); } - p.save(); - View::pdraw(p, rect); - p.restore(); - //--------------------------------------------------- // draw marker //--------------------------------------------------- -- cgit v1.2.3