Mercurial > mplayer.hg

comparison gui/ui/menu.c @ 34684:b03481253518

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Prefer C style for single line comments. Additionally, slightly revise some of these comments.
author ib
date Fri, 24 Feb 2012 17:16:54 +0000
parents f866092d51cd
children ed0e00db4306
comparison
equal deleted inserted replaced
34683:621058eff80f 34684:b03481253518
46 if ( !menuRender && !guiApp.menuWindow.Visible ) return; 46 if ( !menuRender && !guiApp.menuWindow.Visible ) return;
47 47
48 if ( menuRender || menuItem != oldMenuItem ) 48 if ( menuRender || menuItem != oldMenuItem )
49 { 49 {
50 memcpy( menuDrawBuffer,guiApp.menu.Bitmap.Image,guiApp.menu.Bitmap.ImageSize ); 50 memcpy( menuDrawBuffer,guiApp.menu.Bitmap.Image,guiApp.menu.Bitmap.ImageSize );
51 // --- 51 /* --- */
52 if ( menuItem != -1 ) 52 if ( menuItem != -1 )
53 { 53 {
54 buf=(uint32_t *)menuDrawBuffer; 54 buf=(uint32_t *)menuDrawBuffer;
55 drw=(uint32_t *)guiApp.menuSelected.Bitmap.Image; 55 drw=(uint32_t *)guiApp.menuSelected.Bitmap.Image;
56 for ( y=guiApp.menuItems[ menuItem ].y; y < guiApp.menuItems[ menuItem ].y + guiApp.menuItems[ menuItem ].height; y++ ) 56 for ( y=guiApp.menuItems[ menuItem ].y; y < guiApp.menuItems[ menuItem ].y + guiApp.menuItems[ menuItem ].height; y++ )
59 tmp=drw[ y * guiApp.menuSelected.width + x ]; 59 tmp=drw[ y * guiApp.menuSelected.width + x ];
60 if ( !IS_TRANSPARENT ( tmp ) ) buf[ y * guiApp.menu.width + x ]=tmp; 60 if ( !IS_TRANSPARENT ( tmp ) ) buf[ y * guiApp.menu.width + x ]=tmp;
61 } 61 }
62 } 62 }
63 oldMenuItem=menuItem; 63 oldMenuItem=menuItem;
64 // --- 64 /* --- */
65 wsConvert( &guiApp.menuWindow,menuDrawBuffer ); 65 wsConvert( &guiApp.menuWindow,menuDrawBuffer );
66 menuRender=0; 66 menuRender=0;
67 } 67 }
68 wsPutImage( &guiApp.menuWindow ); 68 wsPutImage( &guiApp.menuWindow );
69 } 69 }