forked from qt-creator/qt-creator
QmlDesigner: Link OutputPane visible to DockWidget
Task-number: QDS-1639 Change-Id: I8f384669d402d961683e85ff237a224b6d26cf34 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
committed by
Henning Gründl
parent
46481bd884
commit
eda1439a29
@@ -53,6 +53,9 @@ public:
|
|||||||
void ensureSizeHintAsMinimum();
|
void ensureSizeHintAsMinimum();
|
||||||
int nonMaximizedSize() const;
|
int nonMaximizedSize() const;
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void visibilityChangeRequested(bool visible);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void resizeEvent(QResizeEvent *event) override;
|
void resizeEvent(QResizeEvent *event) override;
|
||||||
void showEvent(QShowEvent *) override;
|
void showEvent(QShowEvent *) override;
|
||||||
|
@@ -612,6 +612,7 @@ void OutputPaneManager::slotHide()
|
|||||||
{
|
{
|
||||||
OutputPanePlaceHolder *ph = OutputPanePlaceHolder::getCurrent();
|
OutputPanePlaceHolder *ph = OutputPanePlaceHolder::getCurrent();
|
||||||
if (ph) {
|
if (ph) {
|
||||||
|
emit ph->visibilityChangeRequested(false);
|
||||||
ph->setVisible(false);
|
ph->setVisible(false);
|
||||||
int idx = currentIndex();
|
int idx = currentIndex();
|
||||||
QTC_ASSERT(idx >= 0, return);
|
QTC_ASSERT(idx >= 0, return);
|
||||||
@@ -654,6 +655,7 @@ void OutputPaneManager::showPage(int idx, int flags)
|
|||||||
if (onlyFlash) {
|
if (onlyFlash) {
|
||||||
g_outputPanes.at(idx).button->flash();
|
g_outputPanes.at(idx).button->flash();
|
||||||
} else {
|
} else {
|
||||||
|
emit ph->visibilityChangeRequested(true);
|
||||||
// make the page visible
|
// make the page visible
|
||||||
ph->setVisible(true);
|
ph->setVisible(true);
|
||||||
|
|
||||||
|
@@ -210,22 +210,6 @@ void DesignModeWidget::disableWidgets()
|
|||||||
m_isDisabled = true;
|
m_isDisabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool DesignModeWidget::eventFilter(QObject *obj, QEvent *event) // TODO
|
|
||||||
{
|
|
||||||
if (event->type() == QEvent::Hide) {
|
|
||||||
qDebug() << ">>> HIDE";
|
|
||||||
m_outputPaneDockWidget->toggleView(false);
|
|
||||||
return true;
|
|
||||||
} else if (event->type() == QEvent::Show) {
|
|
||||||
qDebug() << ">>> SHOW";
|
|
||||||
m_outputPaneDockWidget->toggleView(true);
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
// standard event processing
|
|
||||||
return QObject::eventFilter(obj, event);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DesignModeWidget::setup()
|
void DesignModeWidget::setup()
|
||||||
{
|
{
|
||||||
auto &actionManager = viewManager().designerActionManager();
|
auto &actionManager = viewManager().designerActionManager();
|
||||||
@@ -354,7 +338,8 @@ void DesignModeWidget::setup()
|
|||||||
command->setAttribute(Core::Command::CA_Hide);
|
command->setAttribute(Core::Command::CA_Hide);
|
||||||
mviews->addAction(command);
|
mviews->addAction(command);
|
||||||
|
|
||||||
//outputPanePlaceholder->installEventFilter(this);
|
connect(outputPanePlaceholder, &Core::OutputPanePlaceHolder::visibilityAboutToChange,
|
||||||
|
m_outputPaneDockWidget, &ADS::DockWidget::toggleView);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create toolbars
|
// Create toolbars
|
||||||
|
@@ -86,9 +86,6 @@ public:
|
|||||||
|
|
||||||
static QWidget *createProjectExplorerWidget(QWidget *parent);
|
static QWidget *createProjectExplorerWidget(QWidget *parent);
|
||||||
|
|
||||||
protected:
|
|
||||||
bool eventFilter(QObject *obj, QEvent *event) override;
|
|
||||||
|
|
||||||
private: // functions
|
private: // functions
|
||||||
enum InitializeStatus { NotInitialized, Initializing, Initialized };
|
enum InitializeStatus { NotInitialized, Initializing, Initialized };
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user