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

QtQuickToolBars: bugfix for TextInput and TextEdit

Browse Source 
TextEdit and TextInput were ignored

Reviewed-by: Kai Koehne
This commit is contained in:
Thomas Hartmann
2010-10-08 12:44:16 +02:00
parent f5909abe09
commit 45aa74ab07
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmleditorwidgets/contextpanewidget.cpp
View File

@@ -315,7 +315,9 @@ bool ContextPaneWidget::setType(const QStringList &types)
m_rectangleWidget->hide(); m_rectangleWidget->hide();
m_easingWidget->hide(); m_easingWidget->hide();
if (types.contains("Text")) { if (types.contains("Text") ||
types.contains("TextEdit") ||
types.contains("TextInput")) {
m_currentWidget = m_textWidget; m_currentWidget = m_textWidget;
m_textWidget->show(); m_textWidget->show();
m_textWidget->setStyleVisible(true); m_textWidget->setStyleVisible(true);
@@ -361,7 +363,7 @@ bool ContextPaneWidget::setType(const QStringList &types)
bool ContextPaneWidget::acceptsType(const QStringList &types) bool ContextPaneWidget::acceptsType(const QStringList &types)
{ {
return types.contains("Text") || m_easingWidget->acceptsType(types) || return types.contains("Text") || types.contains("TextEdit") || types.contains("TextInput") || m_easingWidget->acceptsType(types) ||
types.contains("Rectangle") || types.contains("Image") || types.contains("BorderImage"); types.contains("Rectangle") || types.contains("Image") || types.contains("BorderImage");
} }