From 3c859f2c0bc8c0919061d26a4d05c8c360104dfc Mon Sep 17 00:00:00 2001 From: yann300 Date: Fri, 23 Jan 2015 16:24:07 +0100 Subject: [PATCH] - fix function/property name collision => rightViewVisible --- mix/qml/MainContent.qml | 9 +++++---- mix/qml/StatusPane.qml | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mix/qml/MainContent.qml b/mix/qml/MainContent.qml index 7c9d6bf66..430c1176f 100644 --- a/mix/qml/MainContent.qml +++ b/mix/qml/MainContent.qml @@ -80,6 +80,11 @@ Rectangle { rightView.show(); } + function rightViewIsVisible() + { + return rightView.visible; + } + function hideRightView() { if (rightView.visible) rightView.hide(); @@ -89,10 +94,6 @@ Rectangle { webPreview.visible = !webPreview.visible; } - function rightViewVisible() { - return rightView.visible; - } - CodeEditorExtensionManager { headerView: headerPaneTabs; rightView: rightPaneTabs; diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml index 5e1ec7c75..07da269ec 100644 --- a/mix/qml/StatusPane.qml +++ b/mix/qml/StatusPane.qml @@ -113,7 +113,7 @@ Rectangle { Action { id: debugRunActionIcon onTriggered: { - if (mainContent.rightViewVisible()) + if (mainContent.rightViewIsVisible()) mainContent.hideRightView() else mainContent.startQuickDebugging();