FCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xneditor.cpp

equal deleted inserted replaced

-:b01126ce0bec
+:ba63c83f4716
 #include "xnplugindata.h"
 #include "xnrootdata.h"
 #include "xnviewdata.h"
 #include "xnwallpaperview.h"
 #include "xnbackgroundmanager.h"
+#include "xnpopupcontroladapter.h"
 #include "xneditor.h"
 #include "xnpanic.h"
 #include "xnoomsyshandler.h"
 {
 CXnNode* node( nodes[i] );
 CXnPluginData* plugin( viewData.Plugin( node ) );
-if ( plugin && !plugin->Occupied() && plugin->Editable() )
+if ( plugin && !plugin->Occupied() )
 {
 return plugin;
 }
 }
 {
 ui = iViewManager.AppUiAdapter().HsContentController( oPaqDataStr );
 }
 if( ui )
 {
+CXnNode* popup( iViewManager.UiEngine().StylusPopupNode() );
+if ( popup )
+{
+CXnPopupControlAdapter* control =
+static_cast< CXnPopupControlAdapter* >(
+popup->Control() );
+if ( control )
+{
+control->HideMenuL();
+}
+}
 ui->SetContentController( this );
 ui->Activate();
 return;
 }
 XnPropertyNames::style::common::KDisplay,
 XnPropertyNames::style::common::display::KNone );
 }
 }
 }
-}
-// -----------------------------------------------------------------------------
-// CXnEditor::NotifyViewLoadedL
-// -----------------------------------------------------------------------------
-//
-void CXnEditor::NotifyViewLoadedL( const CXnViewData& /*aViewData*/ )
-{
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyConfigureWidgetL
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyViewAdditionL
 // ---------------------------------------------------------------------------
 //
-void CXnEditor::NotifyViewAdditionL( const CXnViewData& /*aViewData*/ )
+void CXnEditor::NotifyViewAdditionL( const CXnPluginData& /*aPluginData*/ )
 {
 NotifyViewListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyViewRemovalL
 // ---------------------------------------------------------------------------
 //
-void CXnEditor::NotifyViewRemovalL( const CXnViewData& /*aViewData*/ )
+void CXnEditor::NotifyViewRemovalL( const CXnPluginData& /*aPluginData*/ )
 {
 NotifyViewListChanged();
 }
 // ---------------------------------------------------------------------------
 // start waiting for new updates again.
 iNotifyWidgetListChanged->Start(
 KNotifyWidgetListChangedDelay,
 KNotifyWidgetListChangedDelay,
 TCallBack( WidgetListChangedCallBack, this ) );
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::WidgetListChangedCallBack
 // ---------------------------------------------------------------------------
 TInt ret( KErrNone );
 const TDesC8& type( aInfo.Type() );
 if ( ( type != KKeyWidget && type != KKeyTemplate ) ||
-aInfo.Uid() == KNullDesC8 )
+aInfo.Uid() == KNullDesC8  || !aInfo.CanBeAdded() )
 {
 // malformed content info
 return KErrArgument;
 }
+CXnPluginData* plugin( NULL );
+if( iTargetPlugin )
+{
+plugin = DeterminePlugin( iViewManager, iTargetPlugin );
+}
+else
+{
+plugin = DeterminePlugin( iViewManager );
+}
+iTargetPlugin = NULL;
 // the widget can not be added. Return proper error code
-if ( IsCurrentViewFull() )
+if ( IsCurrentViewFull() || !plugin )
 {
 return KHsErrorViewFull;
 }
-else if ( !aInfo.CanBeAdded() )
-{
-return KHsErrorMaxInstanceCountExceeded;
-}
-CXnPluginData* plugin( NULL );
-if( iTargetPlugin )
-{
-plugin = DeterminePlugin( iViewManager, iTargetPlugin );
-}
 else
 {
-plugin = DeterminePlugin( iViewManager );
+TInt result;
-}
+if ( aInfo.Type() != KKeyTemplate() )
+{
-iTargetPlugin = NULL;
+result = NonTemplateWidgetCanBeAddedRemovedL( aInfo );
+}
-if ( !plugin )
+else
 {
-return KErrGeneral;
+result = TemplateWidgetCanBeAddedRemovedL( aInfo );
+}
+if ( !( result & ECanBeAdded ) )
+{
+return KHsErrorMaxInstanceCountExceeded;
+}
 }
 ret = iViewManager.LoadWidgetToPluginL( aInfo, *plugin );
 if( ret == KErrNone )
 for ( TInt i = 0; i < plugins.Count(); i++ )
 {
 CXnPluginData* plugin = plugins[ i ];
-if ( plugin && !plugin->Occupied() && plugin->Editable() )
+if ( !plugin->Occupied() )
 {
 isFull = EFalse;
 break;
 }
 }

branch	RCL_3
changeset 102	ba63c83f4716
parent 93	b01126ce0bec