--- a/javauis/lcdui_akn/lcdui/inc/CMIDUtils.h Tue May 11 16:07:20 2010 +0300
+++ b/javauis/lcdui_akn/lcdui/inc/CMIDUtils.h Tue May 25 12:34:19 2010 +0300
@@ -87,7 +87,6 @@
{
public:
inline TScalingData();
- inline TBool operator==(const TScalingData& aData) const;
TSize iOriginalSize;
TSize iTargetSize;
@@ -280,12 +279,26 @@
*/
TSize DoDescaling(TSize aNonScaled);
+
/**
- * Reset of iScalingData
+ * Get information about scaling settings.
+ *
+ * @return ETrue if Nokia-MIDlet-Original-Display-Size is set.
+ * EFalse otherwise.
*
* @since S60 5.0
*/
- void ResetScalingData();
+ TBool IsScalingEnabled();
+
+
+ /**
+ * Gets current size of fullscreen canvas.
+ *
+ * @return current size of fullscreen canvas
+ *
+ * @since S60 5.0
+ */
+ TRect GetOnScreenCanvasRect();
/**
* @return ETrue if aChar is one of the following characters: 0x0a, 0x0d, 0x2028
@@ -354,6 +367,8 @@
*/
CMIDUtils::TScalingData GetScalingData();
+ void UpdateScalingData();
+
void UpdateStickyKeyFlags(const TKeyEvent& aKeyEvent);
void UpdatePTIEngineStatusL();
@@ -410,6 +425,9 @@
// Instace of menu handler. Needed for scaling. Not owned.
CMIDMenuHandler* iMenuHandler;
+
+ // Flag if scaling data was initialized.
+ TBool iScalingDataInitialized;
};
inline void CMIDUtils::Dispose()
@@ -418,25 +436,11 @@
}
inline CMIDUtils::TScalingData::TScalingData(): iOriginalSize(),
- iTargetSize(),
- iScreenSize(),
- iCanvasSize(),
- iRatioX(1.0f),
- iRatioY(1.0f)
+ iTargetSize(),
+ iScreenSize(),
+ iCanvasSize(),
+ iRatioX(1.0f),
+ iRatioY(1.0f)
{}
-inline TBool CMIDUtils::TScalingData::operator==(const TScalingData& aData) const
-{
- if (iOriginalSize == aData.iOriginalSize
- && iTargetSize == aData.iTargetSize
- && iScreenSize == aData.iScreenSize
- && iCanvasSize == aData.iCanvasSize
- && iRatioX == aData.iRatioX
- && iRatioY == aData.iRatioY)
- {
- return ETrue;
- }
- return EFalse;
-}
-
#endif // CMIDUTILS_H