[MPlayer-cvslog] r35780 - trunk/gui/dialog/menu.c

[ib]

Author: ib
Date: Fri Jan 18 18:09:03 2013
New Revision: 35780

Log:
Don't set "normal size" check mark in menu by default.

The "Normal size" item in the menu is currently marked by default if the
video is neither double nor half size, and even if the video window size
isn't the exact video size.

To avoid confusion, only set the check mark, if window and video are the
same size, and mark nothing if not.

Based on a patch by Hans-Dieter Kosch, hdkosch kabelbw de.

Modified:
   trunk/gui/dialog/menu.c

Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c	Fri Jan 18 10:50:30 2013	(r35779)
+++ trunk/gui/dialog/menu.c	Fri Jan 18 18:09:03 2013	(r35780)
@@ -654,7 +654,7 @@ GtkWidget * create_PopUpMenu( void )
            ( guiApp.videoWindow.Height == guiInfo.VideoHeight * 2 ) ) b2=True;
       else if ( ( guiApp.videoWindow.Width == guiInfo.VideoWidth / 2 ) &&
                 ( guiApp.videoWindow.Height == guiInfo.VideoHeight / 2 ) ) b_half=True;
-      else b1=True;
+      else b1=( guiApp.videoWindow.Width == guiInfo.VideoWidth && guiApp.videoWindow.Height == guiInfo.VideoHeight );
      } else b1=!guiApp.videoWindow.isFullScreen;
     H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_MENU_HalfSize,b_half,evHalfSize );
     N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_MENU_NormalSize"      ",b1,evNormalSize );