summaryrefslogtreecommitdiff
path: root/muse2/muse/master
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-16 11:34:53 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-16 11:34:53 +0000
commit4e1ca61b03bab50d5e71e6da433503ac3b4470c0 (patch)
tree4c002df0f12f916b8a30a5e115ea8fbd80c15480 /muse2/muse/master
parentc7d22c133d2d9a5e8494d0285af10da6a6dff9d9 (diff)
fixed saving window state
dialogs now also save and restore their state templates were updated and have now sane defaults for toolbars etc.
Diffstat (limited to 'muse2/muse/master')
-rw-r--r--muse2/muse/master/masteredit.cpp16
-rw-r--r--muse2/muse/master/masteredit.h1
2 files changed, 14 insertions, 3 deletions
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index fd7000dd..9053f3a8 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -427,11 +427,9 @@ void MasterEdit::setTempo(int val)
void MasterEdit::resizeEvent(QResizeEvent* ev)
{
QWidget::resizeEvent(ev);
- _widthInit = ev->size().width();
- _heightInit = ev->size().height();
+ storeInitialState();
}
-
//---------------------------------------------------------
// focusOutEvent
//---------------------------------------------------------
@@ -439,5 +437,17 @@ void MasterEdit::resizeEvent(QResizeEvent* ev)
void MasterEdit::focusOutEvent(QFocusEvent* ev)
{
QWidget::focusOutEvent(ev);
+ storeInitialState();
+ }
+
+
+//---------------------------------------------------------
+// storeInitialState
+//---------------------------------------------------------
+
+void MasterEdit::storeInitialState()
+ {
+ _widthInit = width();
+ _heightInit = height();
_toolbarInit=saveState();
}
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index 5abcfc8d..59a5ab05 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -66,6 +66,7 @@ class MasterEdit : public MidiEditor {
virtual void closeEvent(QCloseEvent*);
virtual void resizeEvent(QResizeEvent*);
virtual void focusOutEvent(QFocusEvent*);
+ void storeInitialState();
private slots:
void _setRaster(int);