summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-12 22:42:38 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-12 22:42:38 +0000
commit207b10cdad908785293c4ad53b98b269a64414f1 (patch)
treee5cbee4938c45ac26dfd2be17fb4f0c986bb1e45 /Gui
parentda9b53946781c31e1634bd2c9f02e67385a0baf9 (diff)
downloadmpv-207b10cdad908785293c4ad53b98b269a64414f1.tar.bz2
mpv-207b10cdad908785293c4ad53b98b269a64414f1.tar.xz
fix black ize
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3477 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/menu.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/Gui/mplayer/menu.h b/Gui/mplayer/menu.h
index 00af9878a5..b1ce70fd7b 100644
--- a/Gui/mplayer/menu.h
+++ b/Gui/mplayer/menu.h
@@ -14,7 +14,7 @@ void mplMenuDraw( wsParamDisplay )
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 @@ void mplMenuDraw( wsParamDisplay )
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 @@ void mplShowMenu( int mx,int my )
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 @@ void mplHideMenu( int mx,int my )
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 @@ void mplMenuInit( void )
appMPlayer.menuWindow.ReDraw=mplMenuDraw;
// appMPlayer.menuWindow.MouseHandler=mplMenuMouseHandle;
// appMPlayer.menuWindow.KeyHandler=mplMainKeyHandle;
-
- wsPostRedisplay( &appMPlayer.menuWindow );
+ mplMenuRender=1; wsPostRedisplay( &appMPlayer.menuWindow );
}