forked from qt-creator/qt-creator
QmlDesigner: Fix feedback dialog on macOS
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:
@@ -66,14 +66,21 @@ Rectangle {
|
||||
height: 96
|
||||
anchors { horizontalCenter: parent.horizontalCenter; top: starRow.bottom; topMargin: 28 }
|
||||
|
||||
TextArea {
|
||||
TextEdit {
|
||||
id: textarea
|
||||
width: 426
|
||||
height: 90
|
||||
color: "#333333";
|
||||
placeholderText: "We highly appreciate additional feedback.\nBouquets, brickbats, or suggestions, all feedback is welcome!"
|
||||
font { pixelSize: 14; family: "Titillium" }
|
||||
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 {
|
||||
|
@@ -740,7 +740,10 @@ void QmlDesignerPlugin::lauchFeedbackPopup(const QString &identifier)
|
||||
qDebug() << m_feedbackWidget->errors().first().toString();
|
||||
}
|
||||
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);
|
||||
|
||||
QQuickItem *root = m_feedbackWidget->rootObject();
|
||||
|
Reference in New Issue
Block a user