summaryrefslogtreecommitdiff
path: root/muse2/muse/master/masteredit.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-23 20:04:52 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-23 20:04:52 +0000
commit5e04b219a6de8e41f132fcaec26876ecdb5ae9b5 (patch)
tree0380e5724d80c6ac91bd448868525d372de60e2b /muse2/muse/master/masteredit.h
parentb5bdb59699abd38a3aa90dfb4d9882b2be7f5be0 (diff)
parenta16b4e2746309724086f55d7df8b15da40939b20 (diff)
merged with deeper_changes. see changelog
Diffstat (limited to 'muse2/muse/master/masteredit.h')
-rw-r--r--muse2/muse/master/masteredit.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index af43c7b0..59a5ab05 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -8,6 +8,9 @@
#ifndef __MASTER_EDIT_H__
#define __MASTER_EDIT_H__
+#include <QByteArray>
+#include <QResizeEvent>
+
#include "midieditor.h"
#include "noteinfo.h"
#include "cobject.h"
@@ -56,9 +59,14 @@ class MasterEdit : public MidiEditor {
QToolButton* enableButton;
static int _rasterInit;
+ static int _widthInit, _heightInit;
+ static QByteArray _toolbarInit;
Q_OBJECT
virtual void closeEvent(QCloseEvent*);
+ virtual void resizeEvent(QResizeEvent*);
+ virtual void focusOutEvent(QFocusEvent*);
+ void storeInitialState();
private slots:
void _setRaster(int);