# HG changeset patch # User pontscho # Date 1008196958 0 # Node ID d8e46c2576c5354b81ab167c6a4f3e2be978ac79 # Parent 390388c752096cfda64cc410d74d260743a9eba7 fix black ize diff -r 390388c75209 -r d8e46c2576c5 Gui/mplayer/menu.h --- a/Gui/mplayer/menu.h Wed Dec 12 22:35:51 2001 +0000 +++ b/Gui/mplayer/menu.h Wed Dec 12 22:42:38 2001 +0000 @@ -14,7 +14,7 @@ unsigned long x,y,tmp; if ( !appMPlayer.menuBase.Bitmap.Image ) return; - if ( !appMPlayer.menuWindow.Visible ) return; + if ( !mplMenuRender && !appMPlayer.menuWindow.Visible ) return; if ( mplMenuRender || mplMenuItem != mplOldMenuItem ) { @@ -34,7 +34,6 @@ mplOldMenuItem=mplMenuItem; // --- wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.ImageSize ); -// wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.Height * appMPlayer.menuBase.Bitmap.Width ); mplMenuRender=0; } wsPutImage( &appMPlayer.menuWindow ); @@ -80,8 +79,10 @@ mplMenuItem = 0; wsMoveWindow( &appMPlayer.menuWindow,False,x,y ); + wsMoveTopWindow( &appMPlayer.menuWindow ); + mplMenuRender=1; wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow ); - wsMoveTopWindow( &appMPlayer.menuWindow ); + wsPostRedisplay( &appMPlayer.menuWindow ); } void mplHideMenu( int mx,int my ) @@ -99,8 +100,8 @@ if ( ( x < 0 ) || ( y < 0 ) ) return; - printf( "---------> %d %d,%d\n",i,x,y ); - printf( "--------> mi: %d,%d %dx%d\n",appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].height ); +// printf( "---------> %d %d,%d\n",i,x,y ); +// printf( "--------> mi: %d,%d %dx%d\n",appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].height ); if ( wgIsRect( x,y, appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y, appMPlayer.MenuItems[i].x+appMPlayer.MenuItems[i].width, @@ -138,6 +139,5 @@ appMPlayer.menuWindow.ReDraw=mplMenuDraw; // appMPlayer.menuWindow.MouseHandler=mplMenuMouseHandle; // appMPlayer.menuWindow.KeyHandler=mplMainKeyHandle; - - wsPostRedisplay( &appMPlayer.menuWindow ); + mplMenuRender=1; wsPostRedisplay( &appMPlayer.menuWindow ); }