# HG changeset patch # User Mychaela Falconia # Date 1611026641 0 # Node ID 717f87d300aefba43d76746350702c4f8f6aa676 # Parent 6838be2e9067b7564377c5d646acaae6f4f000c3 mmiSoftKeys.c: white space fixes diff -r 6838be2e9067 -r 717f87d300ae src/ui/bmi/mmiSoftKeys.c --- a/src/ui/bmi/mmiSoftKeys.c Tue Jan 19 03:09:30 2021 +0000 +++ b/src/ui/bmi/mmiSoftKeys.c Tue Jan 19 03:24:01 2021 +0000 @@ -1,6 +1,6 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -11,19 +11,18 @@ $Project name: Basic MMI $Project code: BMI (6349) - $Module: Softkeys - $File: MmiSoftkeys.c - $Revision: 1.0 + $Module: Softkeys + $File: MmiSoftkeys.c + $Revision: 1.0 - $Author: Condat(UK) - $Date: 22/02/01 + $Author: Condat(UK) + $Date: 22/02/01 ******************************************************************************** Description: - ******************************************************************************** $History: @@ -31,7 +30,7 @@ xrashmic 5 Oct, 2005 MMI-SPR-29356, MMI-SPR-29357 To display '?' to indicate to the user that help is available for a STK menu - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End @@ -148,12 +147,12 @@ */ SoftKeysResult softKeysHndCreate( MfwHnd window, SoftKeysSetup *setup) { - if( window == NULL || setup == NULL ) + if( window == NULL || setup == NULL ) { return SOFTKEYS_FAILURE; } - return softKeysWinCreate( (MfwWin *)((MfwHdr *)window)->data, setup); + return softKeysWinCreate( (MfwWin *)((MfwHdr *)window)->data, setup); } @@ -212,12 +211,12 @@ */ SoftKeysResult softKeysHndSet( MfwHnd window, SoftKeysSetup *changes) { - if( window == NULL || changes == NULL ) + if( window == NULL || changes == NULL ) { return SOFTKEYS_FAILURE; } - return softKeysWinSet( (MfwWin *)((MfwHdr *)window)->data, changes); + return softKeysWinSet( (MfwWin *)((MfwHdr *)window)->data, changes); } @@ -283,12 +282,12 @@ */ void softKeysHndUpdate(MfwHnd window) { - if( window == NULL ) + if( window == NULL ) { return; } - softKeysWinUpdate((MfwWin *)((MfwHdr *)window)->data); + softKeysWinUpdate((MfwWin *)((MfwHdr *)window)->data); } @@ -313,12 +312,12 @@ */ void softkeysHndDelete(MfwHnd window) { - if( window == NULL ) + if( window == NULL ) { return; } - softkeysWinDelete((MfwWin *)((MfwHdr *)window)->data); + softkeysWinDelete((MfwWin *)((MfwHdr *)window)->data); } @@ -336,11 +335,13 @@ FREE_MEMORY( (void *)softKeys, sizeof(SoftKeysData)); } + typedef struct { char* str; int posX; int posY; } T_SK_DATA; + typedef struct { T_SK_DATA lsk; T_SK_DATA rsk; @@ -413,6 +414,7 @@ softKeys_displayAll( &sk_data , format, colIndex); } + /******************************************************************************* $Function: @@ -504,9 +506,6 @@ rect.sx = rskX-lskX; rect.sy = Mmi_layout_softkeyHeight(); softKeys_displayStrXY(lsk, rsk, 0,COLOUR_LIST_MAIN, &rect); - - - } @@ -537,7 +536,7 @@ dspl_TextOut( 5 + dspl_GetTextExtent(lsk, (USHORT)strlen(lsk)) ,lpos, 0, ind); - dspl_TextOut((mmiScrX-1)-RightMargin-dspl_GetTextExtent(rsk, (USHORT)strlen(rsk)),lpos ,0, rsk); + dspl_TextOut((mmiScrX-1)-RightMargin-dspl_GetTextExtent(rsk, (USHORT)strlen(rsk)),lpos ,0, rsk); } @@ -547,12 +546,12 @@ $Description: Display softkeys with text strings instead of text ID's - $Returns: None + $Returns: None $Arguments: LeftSoftKey - char array to be displayed at the bottom-left of the display - or NULL if no string is to be displayed - RightSoftKey- char array to be displayed at the bottom-right of the display - or NULL if no string is to be displayed + or NULL if no string is to be displayed + RightSoftKey- char array to be displayed at the bottom-right of the display + or NULL if no string is to be displayed $History GW 28/11/02 - @@ -573,7 +572,7 @@ $Function: displayHelpSymbol $Description: Displaying '?' to indicate to the user that help is available for a menu - xrashmic 5 Oct, 2005 MMI-SPR-29356, MMI-SPR-29357 + xrashmic 5 Oct, 2005 MMI-SPR-29356, MMI-SPR-29357 $Returns: None @@ -593,7 +592,6 @@ //Display the symbol in the center between the softkeys dspl_TextOut(rect.px, rect.py, DSPL_TXTATTR_CURRENT_MODE, "?"); resources_restoreMnuColour(); - } @@ -620,7 +618,7 @@ $Function: displayCameraIcon $Description: Displaying Camera icon to indicate to the user that user can use the - menu select key to capture the image. + menu select key to capture the image. $Returns: None @@ -730,7 +728,7 @@ $Function: displayCameraIcon $Description: Displaying Camera icon to indicate to the user that user can use the - menu select key to capture the image. + menu select key to capture the image. $Returns: None @@ -771,5 +769,3 @@ } #endif - -