From 464cd15f0af4fb072d9b50e9d3e2a077f4d3d4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 21 Nov 2006 20:41:12 +0000 Subject: [PATCH] * you can now assign styles to shapes that had none assigned before * Transformer menu is correctly enabled/disabled when a shape is selected git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19351 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/icon-o-matic/gui/TransformerListView.cpp | 15 +++++++-------- .../icon-o-matic/style/AssignStyleCommand.cpp | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/apps/icon-o-matic/gui/TransformerListView.cpp b/src/apps/icon-o-matic/gui/TransformerListView.cpp index 8b7eba1c20..17b9396d45 100644 --- a/src/apps/icon-o-matic/gui/TransformerListView.cpp +++ b/src/apps/icon-o-matic/gui/TransformerListView.cpp @@ -400,14 +400,13 @@ TransformerListView::SetShape(Shape* shape) fShape = shape; - if (!fShape) - return; - - fShape->AddListener(this); - - int32 count = fShape->CountTransformers(); - for (int32 i = 0; i < count; i++) - _AddTransformer(fShape->TransformerAtFast(i), i); + if (fShape) { + fShape->AddListener(this); + + int32 count = fShape->CountTransformers(); + for (int32 i = 0; i < count; i++) + _AddTransformer(fShape->TransformerAtFast(i), i); + } _UpdateMenu(); } diff --git a/src/apps/icon-o-matic/style/AssignStyleCommand.cpp b/src/apps/icon-o-matic/style/AssignStyleCommand.cpp index 799697ba4d..13c86c4c0c 100644 --- a/src/apps/icon-o-matic/style/AssignStyleCommand.cpp +++ b/src/apps/icon-o-matic/style/AssignStyleCommand.cpp @@ -38,7 +38,7 @@ AssignStyleCommand::~AssignStyleCommand() status_t AssignStyleCommand::InitCheck() { - return fShape && fOldStyle && fNewStyle ? B_OK : B_NO_INIT; + return fShape && fNewStyle ? B_OK : B_NO_INIT; } // Perform