[Traverso-commit] traverso/src/sheetcanvas AudioClipView.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/04/04 23:19:34

Modified files:
        src/sheetcanvas: AudioClipView.cpp 

Log message:
        * background color choice should check for selection first, then if 
it's muted, not the other way around

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.26&r2=1.27

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- AudioClipView.cpp   22 Mar 2009 20:24:44 -0000      1.26
+++ AudioClipView.cpp   4 Apr 2009 23:19:33 -0000       1.27
@@ -149,12 +149,12 @@
                if (m_clip->recording_state() == AudioClip::RECORDING) {
                        painter->fillRect(xstart, 0, pixelcount+1, m_height, 
m_brushBgRecording);
                } else {
-                       if (m_clip->is_muted()) {
-                               if (mousehover) painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgMutedHover);
-                               else            painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgMuted);
-                       } else if (m_clip->is_selected()) {
+                        if (m_clip->is_selected()) {
                                if (mousehover) painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgSelectedHover);
                                else            painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgSelected);
+                        } else if (m_clip->is_muted()) {
+                               if (mousehover) painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgMutedHover);
+                               else            painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgMuted);
                        } else {
                                if (mousehover) painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBgHover);
                                else            painter->fillRect(xstart, 0, 
pixelcount+1, m_height, m_brushBg);