forked from qt-creator/qt-creator
Unmaximizing output pane should restore previous size.
It was resetting to the default instead. Task-number: QTCREATORBUG-4849 Change-Id: Ibe3acf7045dd051cca3bff94888b155e00fec81b Reviewed-on: http://codereview.qt.nokia.com/954 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -349,8 +349,7 @@ void OutputPaneManager::buttonTriggered()
|
||||
int idx = it.key();
|
||||
|
||||
if (m_widgetComboBox->itemData(m_widgetComboBox->currentIndex()).toInt() == idx &&
|
||||
OutputPanePlaceHolder::isCurrentVisible()
|
||||
&& OutputPanePlaceHolder::getCurrent()->closeable()) {
|
||||
OutputPanePlaceHolder::isCurrentVisible()) {
|
||||
// we should toggle and the page is already visible and we are actually closeable
|
||||
slotHide();
|
||||
} else {
|
||||
@@ -464,16 +463,6 @@ void OutputPaneManager::togglePage(bool focus)
|
||||
}
|
||||
}
|
||||
|
||||
void OutputPaneManager::setCloseable(bool b)
|
||||
{
|
||||
m_closeButton->setVisible(b);
|
||||
}
|
||||
|
||||
bool OutputPaneManager::closeable()
|
||||
{
|
||||
return m_closeButton->isVisibleTo(m_closeButton->parentWidget());
|
||||
}
|
||||
|
||||
void OutputPaneManager::focusInEvent(QFocusEvent *e)
|
||||
{
|
||||
if (m_outputWidgetPane->currentWidget())
|
||||
|
||||
Reference in New Issue
Block a user