summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2010-12-31 00:09:43 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2010-12-31 00:09:43 +0000
commit3a6b421ef02d7defbc6207fdd8fe7fa5608fa2bc (patch)
tree62268c83eb7d4a83a55ef0eabdd55293d9c4c436
parent93be6bea35c4cbddf9f6846d6a4da1b363e10cd2 (diff)
In ctrl canvas, draw the grid before anything else
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/ctrl/ctrlcanvas.cpp11
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
//---------------------------------------------------