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

Merge pull request #2358 from michaelgregorius/2288-piano-automation-size

Browse Source 
Fixes the storage of the windows state for invisible windows (#2288)
This commit is contained in:
Michael Gregorius
2015-09-17 18:02:57 +02:00
parent 09bc6f158a 7881e0315d
commit ab1cc3487d
8 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/MainWindow.h
View File

@@ -99,7 +99,7 @@ public:
return m_keyMods.m_alt;
}
static void saveWidgetState( QWidget * _w, QDomElement & _de );
static void saveWidgetState( QWidget * _w, QDomElement & _de, QSize const & sizeIfInvisible = QSize(0, 0) );
static void restoreWidgetState( QWidget * _w, const QDomElement & _de );
public slots:

11
src/gui/MainWindow.cpp
View File

@@ -701,7 +701,7 @@ void MainWindow::clearKeyModifiers()
void MainWindow::saveWidgetState( QWidget * _w, QDomElement & _de )
void MainWindow::saveWidgetState( QWidget * _w, QDomElement & _de, QSize const & sizeIfInvisible )
{
// If our widget is the main content of a window (e.g. piano roll, FxMixer, etc),
// we really care about the position of the *window* - not the position of the widget within its window
@@ -716,14 +716,17 @@ void MainWindow::saveWidgetState( QWidget * _w, QDomElement & _de )
SubWindow *asSubWindow = qobject_cast<SubWindow*>(_w);
QRect normalGeom = asSubWindow != nullptr ? asSubWindow->getTrueNormalGeometry() : _w->normalGeometry();
_de.setAttribute( "visible", _w->isVisible() );
bool visible = _w->isVisible();
_de.setAttribute( "visible", visible );
_de.setAttribute( "minimized", _w->isMinimized() );
_de.setAttribute( "maximized", _w->isMaximized() );
_de.setAttribute( "x", normalGeom.x() );
_de.setAttribute( "y", normalGeom.y() );
_de.setAttribute( "width", normalGeom.width() );
_de.setAttribute( "height", normalGeom.height() );
QSize sizeToStore = visible ? normalGeom.size() : sizeIfInvisible;
_de.setAttribute( "width", sizeToStore.width() );
_de.setAttribute( "height", sizeToStore.height() );
}

2
src/gui/editors/AutomationEditor.cpp
View File

@@ -228,7 +228,7 @@ void AutomationEditor::setCurrentPattern(AutomationPattern * new_pattern )
void AutomationEditor::saveSettings(QDomDocument & doc, QDomElement & dom_parent)
{
MainWindow::saveWidgetState(parentWidget(), dom_parent);
MainWindow::saveWidgetState(parentWidget(), dom_parent, QSize( 640, 400 ));
}

2
src/gui/editors/BBEditor.cpp
View File

@@ -230,7 +230,7 @@ void BBTrackContainerView::removeBBView(int bb)
void BBTrackContainerView::saveSettings(QDomDocument& doc, QDomElement& element)
{
MainWindow::saveWidgetState(parentWidget(), element);
MainWindow::saveWidgetState(parentWidget(), element, QSize( 640, 400 ) );
}
void BBTrackContainerView::loadSettings(const QDomElement& element)

2
src/gui/editors/PianoRoll.cpp
View File

@@ -4180,7 +4180,7 @@ void PianoRollWindow::reset()
void PianoRollWindow::saveSettings(QDomDocument & doc, QDomElement & de)
{
MainWindow::saveWidgetState(this, de);
MainWindow::saveWidgetState(this, de, QSize( 640, 480 ) );
}
void PianoRollWindow::loadSettings(const QDomElement & de)

2
src/gui/editors/SongEditor.cpp
View File

@@ -265,7 +265,7 @@ SongEditor::~SongEditor()
void SongEditor::saveSettings( QDomDocument& doc, QDomElement& element )
{
MainWindow::saveWidgetState(parentWidget(), element);
MainWindow::saveWidgetState(parentWidget(), element, QSize( 640, 400 ));
}
void SongEditor::loadSettings( const QDomElement& element )

2
src/gui/widgets/ControllerRackView.cpp
View File

@@ -103,7 +103,7 @@ ControllerRackView::~ControllerRackView()
void ControllerRackView::saveSettings( QDomDocument & _doc,
QDomElement & _this )
{
MainWindow::saveWidgetState( this, _this );
MainWindow::saveWidgetState( this, _this, QSize( 400, 300) );
}

2
src/gui/widgets/ProjectNotes.cpp
View File

@@ -379,7 +379,7 @@ void ProjectNotes::alignmentChanged( int _a )
void ProjectNotes::saveSettings( QDomDocument & _doc, QDomElement & _this )
{
MainWindow::saveWidgetState( this, _this );
MainWindow::saveWidgetState( this, _this, QSize( 640, 400 ) );
QDomCDATASection ds = _doc.createCDATASection( m_edit->toHtml() );
_this.appendChild( ds );