feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix feedback dialog on macOS

Browse Source 
Qt::SplashScreen prevents the widget from getting any keyboard focus.
Using TextEdit for neutral styling.

Change-Id: I56b9a3ac10d68aebdef4064fed4dd2e31bf82b8e
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2023-02-20 17:16:23 +01:00
parent 0b9eb65d97
commit 479924497f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
share/qtcreator/qmldesigner/feedback/FeedbackPopup.qml
View File

@@ -66,14 +66,21 @@ Rectangle {
height: 96 height: 96
anchors { horizontalCenter: parent.horizontalCenter; top: starRow.bottom; topMargin: 28 } anchors { horizontalCenter: parent.horizontalCenter; top: starRow.bottom; topMargin: 28 }
TextArea { TextEdit {
id: textarea id: textarea
width: 426 width: 426
height: 90 height: 90
color: "#333333"; color: "#333333";
placeholderText: "We highly appreciate additional feedback.\nBouquets, brickbats, or suggestions, all feedback is welcome!"
font { pixelSize: 14; family: "Titillium" } font { pixelSize: 14; family: "Titillium" }
wrapMode: Text.Wrap wrapMode: Text.Wrap
property string placeholderText: "We highly appreciate additional feedback.\nBouquets, brickbats, or suggestions, all feedback is welcome!"
Text {
text: textarea.placeholderText
color: "gray"
visible: !textarea.text
font: parent.font
}
} }
background: Rectangle { background: Rectangle {

5
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -740,7 +740,10 @@ void QmlDesignerPlugin::lauchFeedbackPopup(const QString &identifier)
qDebug() << m_feedbackWidget->errors().first().toString(); qDebug() << m_feedbackWidget->errors().first().toString();
} }
m_feedbackWidget->setWindowModality(Qt::ApplicationModal); m_feedbackWidget->setWindowModality(Qt::ApplicationModal);
m_feedbackWidget->setWindowFlags(Qt::SplashScreen); if (Utils::HostOsInfo::isMacHost())
m_feedbackWidget->setWindowFlags(Qt::Dialog);
else
m_feedbackWidget->setWindowFlags(Qt::SplashScreen);
m_feedbackWidget->setAttribute(Qt::WA_DeleteOnClose); m_feedbackWidget->setAttribute(Qt::WA_DeleteOnClose);
QQuickItem *root = m_feedbackWidget->rootObject(); QQuickItem *root = m_feedbackWidget->rootObject();