hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.1'

Browse Source 
# Conflicts:
#	include/PianoRoll.h
#	src/gui/editors/PianoRoll.cpp
This commit is contained in:
Lukas W
2015-06-15 10:11:53 +02:00
parent 8b9868e0e5 5265ec988f
commit 44f8b24fb3
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/PianoRoll.h
View File

@@ -117,6 +117,7 @@ protected:
virtual void paintEvent( QPaintEvent * pe );
virtual void resizeEvent( QResizeEvent * re );
virtual void wheelEvent( QWheelEvent * we );
virtual void focusOutEvent( QFocusEvent * );
int getKey( int y ) const;
static inline void drawNoteRect( QPainter & p, int x, int y,