diff -r 79859ed3eea9 -r 919f36ff910f widgets/widgetapp/src/WidgetUiWindowView.cpp --- a/widgets/widgetapp/src/WidgetUiWindowView.cpp Tue Aug 31 16:17:46 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiWindowView.cpp Wed Sep 01 12:28:30 2010 +0100 @@ -24,22 +24,22 @@ #include "WidgetUiWindow.h" #include #include -#include +#include #include #include "WidgetUi.hrh" #include -#include +#include #include #include #include -#include +#include #include #include #include #include -#include +#include #ifdef RD_SCALABLE_UI_V2 -#include // For Layout_Meta_Data landscape/portrait status +#include // For Layout_Meta_Data landscape/portrait status #include #endif @@ -229,6 +229,18 @@ { if (!iWindowManager.ActiveWindow()) return; + #ifdef RD_SCALABLE_UI_V2 + if (PenEnabled()&&(Layout_Meta_Data::IsLandscapeOrientation())&& IsEditMode()) + { + TInt newResId = Cba()->IsVisible() ? + R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT : + R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS; + + StatusPane()->SwitchLayoutL(newResId); + StatusPane()->ApplyCurrentSettingsL(); + StatusPane()->MakeVisible(ETrue); + } + #endif CBrCtlInterface* engine = iWindowManager.ActiveWindow()->Engine(); if( engine && (aResourceId == R_WIDGETUI_MENU || aResourceId >= R_CASCADE_MENU_1) ) { @@ -306,7 +318,7 @@ if (resId != newResId) { StatusPane()->SwitchLayoutL(newResId); - } + } } else //Portrait { @@ -400,7 +412,7 @@ // TBool CWidgetUiWindowView::IsOptionsMenuActivated() { - return iIsOptionsMenuActivated; + return AppUi()->IsDisplayingMenuOrDialog(); }