[Mplayer-cvslog] CVS: main/Gui/mplayer menu.h,1.5,1.6

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv4586/Gui/mplayer

Modified Files:
	menu.h 
Log Message:
fix black ize

Index: menu.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- menu.h	12 Nov 2001 15:16:13 -0000	1.5
+++ menu.h	12 Dec 2001 22:42:38 -0000	1.6
@@ -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 );
- wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow );
  wsMoveTopWindow( &appMPlayer.menuWindow );
+ mplMenuRender=1;
+ wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow );
+ 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 );
 }