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

QmlDesigner: Add more selection functions in SelectionContext

Browse Source 
It is much smarter to use the view functions instead of generating the whole
list and pick the first item or ask if the list is empty.

Change-Id: Ifcd40784ddab75c505b5f7f2dfc7b11cbd11c69d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-25 12:41:19 +02:00
parent 4b3e3aaa71
commit 877f9081cc
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
View File

@@ -151,7 +151,7 @@ void toFront(const SelectionContext &selectionState)
return;
try {
QmlItemNode node = selectionState.selectedModelNodes().first();
QmlItemNode node = selectionState.firstSelectedModelNode();
if (node.isValid()) {
signed int maximumZ = getMaxZValue(siblingsForNode(node));
maximumZ++;
@@ -168,7 +168,7 @@ void toBack(const SelectionContext &selectionState)
if (!selectionState.view())
return;
try {
QmlItemNode node = selectionState.selectedModelNodes().first();
QmlItemNode node = selectionState.firstSelectedModelNode();
if (node.isValid()) {
signed int minimumZ = getMinZValue(siblingsForNode(node));
minimumZ--;
@@ -248,11 +248,11 @@ void setVisible(const SelectionContext &selectionState)
void setFillWidth(const SelectionContext &selectionState)
{
if (!selectionState.view()
|| selectionState.selectedModelNodes().isEmpty())
|| !selectionState.hasSingleSelectedModelNode())
return;
try {
selectionState.selectedModelNodes().first().variantProperty("Layout.fillWidth").setValue(selectionState.toggled());
selectionState.firstSelectedModelNode().variantProperty("Layout.fillWidth").setValue(selectionState.toggled());
} catch (RewritingException &e) { //better save then sorry
QMessageBox::warning(0, "Error", e.description());
}
@@ -261,11 +261,11 @@ void setFillWidth(const SelectionContext &selectionState)
void setFillHeight(const SelectionContext &selectionState)
{
if (!selectionState.view()
|| selectionState.selectedModelNodes().isEmpty())
|| !selectionState.hasSingleSelectedModelNode())
return;
try {
selectionState.selectedModelNodes().first().variantProperty("Layout.fillHeight").setValue(selectionState.toggled());
selectionState.firstSelectedModelNode().variantProperty("Layout.fillHeight").setValue(selectionState.toggled());
} catch (RewritingException &e) { //better save then sorry
QMessageBox::warning(0, "Error", e.description());
}
@@ -623,7 +623,7 @@ void layoutFlowPositioner(const SelectionContext &selectionState)
void layoutRowLayout(const SelectionContext &selectionState)
{
if (!selectionState.view()
|| selectionState.selectedModelNodes().isEmpty())
|| !selectionState.hasSingleSelectedModelNode())
return;
static TypeName rowLayoutType = "QtQuick.Layouts.RowLayout";
@@ -671,7 +671,7 @@ void layoutRowLayout(const SelectionContext &selectionState)
void layoutColumnLayout(const SelectionContext &selectionState)
{
if (!selectionState.view()
|| selectionState.selectedModelNodes().isEmpty())
|| !selectionState.hasSingleSelectedModelNode())
return;
static TypeName columnLayoutType = "QtQuick.Layouts.ColumnLayout";
@@ -719,7 +719,7 @@ void layoutColumnLayout(const SelectionContext &selectionState)
void layoutGridLayout(const SelectionContext &selectionState)
{
if (!selectionState.view()
|| selectionState.selectedModelNodes().isEmpty())
|| !selectionState.hasSingleSelectedModelNode())
return;
static TypeName gridLayoutType = "QtQuick.Layouts.GridLayout";

10
src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
View File

@@ -69,11 +69,21 @@ ModelNode SelectionContext::currentSingleSelectedNode() const
return view()->singleSelectedModelNode();
}
ModelNode SelectionContext::firstSelectedModelNode() const
{
return view()->firstSelectedModelNode();
}
QList<ModelNode> SelectionContext::selectedModelNodes() const
{
return view()->selectedModelNodes();
}
bool SelectionContext::hasSingleSelectedModelNode() const
{
return view()->hasSelectedModelNodes();
}
AbstractView *SelectionContext::view() const
{
return m_view.data();

2
src/plugins/qmldesigner/components/componentcore/selectioncontext.h
View File

@@ -48,7 +48,9 @@ public:
bool isInBaseState() const;
ModelNode currentSingleSelectedNode() const;
ModelNode firstSelectedModelNode() const;
QList<ModelNode> selectedModelNodes() const;
bool hasSingleSelectedModelNode() const;
AbstractView *view() const;