iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

If we show an error, or info, message whilst using compact interface - then adjust size to take message widget into account.

Browse Source
This commit is contained in:
craig.p.drummond
2012-08-09 20:26:42 +00:00
committed by craig.p.drummond
parent 6a09f94b64
commit 14bed7ca3a
3 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
gui/mainwindow.cpp
View File

@@ -1511,11 +1511,16 @@ void MainWindow::showInformation(const QString &message)
void MainWindow::messageWidgetVisibility(bool v)
{
#ifdef CANTATA_ANDROID
Q_UNUSED(v)
#else
if (v && !splitter->isVisible()) {
expandInterfaceAction->trigger();
#ifndef CANTATA_ANDROID
if (!splitter->isVisible()) {
int prevWidth=width();
int compactHeight=calcCompactHeight();
setFixedHeight(compactHeight);
QApplication::processEvents();
resize(prevWidth, compactHeight);
setFixedHeight(compactHeight);
}
#endif
}
@@ -2755,13 +2760,23 @@ int MainWindow::calcMinHeight()
return 256;
}
int MainWindow::calcCompactHeight()
{
int spacing=style()->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Vertical);
if (spacing<0) {
spacing=4;
}
// For some reason height is always larger than it needs to be - so fix this to cover height +4
return qMax(qMax(playPauseTrackButton->height(),
trackLabel->height()+artistLabel->height()+spacing)+
songTimeElapsedLabel->height()+positionSlider->height()+(spacing*2),
coverWidget->height()+spacing)+
(messageWidget->isVisible() ? (messageWidget->sizeHint().height()+spacing) : 0);
}
#ifndef CANTATA_ANDROID
void MainWindow::togglePlayQueue()
{
if (!expandInterfaceAction->isChecked() && messageWidget->isVisible()) {
expandInterfaceAction->trigger();
return;
}
if (splitter->isVisible()==expandInterfaceAction->isChecked()) {
setMinimumHeight(calcMinHeight());
return;
@@ -2776,18 +2791,10 @@ void MainWindow::togglePlayQueue()
setMinimumHeight(0);
lastMax=isMaximized();
expandedSize=size();
int spacing=style()->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Vertical);
if (spacing<0) {
spacing=4;
}
// For some reason height is always larger than it needs to be - so fix this to cover height +4
compactHeight=qMax(qMax(playPauseTrackButton->height(), trackLabel->height()+artistLabel->height()+spacing)+
songTimeElapsedLabel->height()+positionSlider->height()+(spacing*2),
coverWidget->height()+spacing);
compactHeight=calcCompactHeight();
} else {
collapsedSize=size();
setMinimumHeight(calcMinHeight());
setMaximumHeight(INT_MAX);
setFixedHeight(calcMinHeight());
}
int prevWidth=size().width();
splitter->setVisible(showing);
@@ -2803,18 +2810,13 @@ void MainWindow::togglePlayQueue()
if (adjustWidth || adjustHeight) {
resize(adjustWidth ? expandedSize.width() : size().width(), adjustHeight ? expandedSize.height() : size().height());
}
if (messageWidget->isVisible()) {
messageWidget->adjustSize();
QApplication::processEvents();
}
if (lastMax) {
showMaximized();
}
} else {
// Widths also sometimes expands, so make sure this is no larger than it was before...
resize(collapsedSize.isValid() ? collapsedSize.width() : (size().width()>prevWidth ? prevWidth : size().width()), compactHeight);
setMinimumHeight(size().height());
setMaximumHeight(size().height());
setFixedHeight(size().height());
}
if (!p.isNull()) {