[Mplayerplug-in-cvs] mplayerplug-in/Source plugin.cpp,1.330,1.331

[Kevin D. <kde...@us...>]

Update of /cvsroot/mplayerplug-in/mplayerplug-in/Source
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23297/Source

Modified Files:
	plugin.cpp 
Log Message:
Cleanup layout of GUI when using small window

Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.330
retrieving revision 1.331
diff -C2 -d -r1.330 -r1.331
*** plugin.cpp	23 Dec 2006 15:37:38 -0000	1.330
--- plugin.cpp	4 Jan 2007 18:26:20 -0000	1.331
***************
*** 1030,1048 ****
  			  10, 60);
  	} else {
! 	    if (window_height < 20) {
! 		if (window_width < 126) {
! 		    gtk_fixed_put(GTK_FIXED(fixed_container),
! 				  GTK_WIDGET(status), 65, 0);
! 		} else {
! 		    gtk_fixed_put(GTK_FIXED(fixed_container),
! 				  GTK_WIDGET(status), 105, 0);
! 		}
! 	    } else {
! 		gtk_fixed_put(GTK_FIXED(fixed_container),
! 			      GTK_WIDGET(status), 10, 10);
! 	    }
  	    gtk_fixed_put(GTK_FIXED(fixed_container),
  			  GTK_WIDGET(progress_bar), 10,
! 			  window_height - 20);
  	    if (!hidestatus)
  		gtk_widget_show(GTK_WIDGET(progress_bar));
--- 1030,1039 ----
  			  10, 60);
  	} else {
! 	    // small window layout
! 	    gtk_fixed_put(GTK_FIXED(fixed_container),
! 			  GTK_WIDGET(status), 0, 0);
  	    gtk_fixed_put(GTK_FIXED(fixed_container),
  			  GTK_WIDGET(progress_bar), 10,
! 			  window_height - 31);
  	    if (!hidestatus)
  		gtk_widget_show(GTK_WIDGET(progress_bar));
***************
*** 1051,1065 ****
  					window_width - 20, 15);
  	    gtk_widget_set_size_request(GTK_WIDGET(status),
! 					window_width - 20,
! 					window_height - 25);
  #endif
  #ifdef GTK1_ENABLED
- 	    if (DEBUG > 1)
- 		printf("< 125 setup\n");
  	    gtk_widget_set_usize(GTK_WIDGET(progress_bar),
  				 aWindow->width - 20, 15);
  	    gtk_widget_set_usize(GTK_WIDGET(status),
! 				 aWindow->width - 20,
! 				 aWindow->height - 25);
  #endif
  	}
--- 1042,1054 ----
  					window_width - 20, 15);
  	    gtk_widget_set_size_request(GTK_WIDGET(status),
! 					window_width,
! 					window_height - 31);
  #endif
  #ifdef GTK1_ENABLED
  	    gtk_widget_set_usize(GTK_WIDGET(progress_bar),
  				 aWindow->width - 20, 15);
  	    gtk_widget_set_usize(GTK_WIDGET(status),
! 				 aWindow->width,
! 				 aWindow->height - 31);
  #endif
  	}
***************
*** 1283,1287 ****
  	    gtk_fixed_move(GTK_FIXED(fixed_container),
  			   GTK_WIDGET(progress_bar),
! 			   10, window_height - 50);
  
  	    gtk_widget_set_usize(GTK_WIDGET(progress_bar),
--- 1272,1276 ----
  	    gtk_fixed_move(GTK_FIXED(fixed_container),
  			   GTK_WIDGET(progress_bar),
! 			   10, window_height - 31);
  
  	    gtk_widget_set_usize(GTK_WIDGET(progress_bar),