[Mplayerplug-in-cvs] mplayerplug-in/Source plugin.cpp,1.109,1.110

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

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

Modified Files:
	plugin.cpp 
Log Message:
Improve resize issues in NP_FULL mode


Index: plugin.cpp
===================================================================
RCS file: /cvsroot/mplayerplug-in/mplayerplug-in/Source/plugin.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** plugin.cpp	22 Apr 2004 15:02:57 -0000	1.109
--- plugin.cpp	23 Apr 2004 17:23:11 -0000	1.110
***************
*** 697,704 ****
  		printf("New Size: %ix%i\n", aWindow->width,
  		       aWindow->height);
- 	    if (mode == NP_EMBED) {
- 		embed_width = aWindow->width;
- 		embed_height = aWindow->height;
- 	    }
  	    setwindow++;
  
--- 697,700 ----
***************
*** 726,732 ****
--- 722,756 ----
  	    }
  	}
+ 	if (mode == NP_EMBED) {
+ 	    embed_width = aWindow->width;
+ 	    embed_height = aWindow->height;
+ 	} else {
+ 	    window_width = aWindow->width;
+ 	    window_height = aWindow->height;
+ 	}
      }
  
+     if (DEBUG > 1)
+         printf("resizing widgets to %i x %i \n", aWindow->width, aWindow->height);
+ 	
+ #ifdef GTK2_ENABLED
+     gtk_widget_set_size_request(GTK_WIDGET(status),
+ 				aWindow->width - 20,
+ 				aWindow->height - 25);
+ #endif
+ #ifdef GTK1_ENABLED
+     gtk_widget_set_usize(GTK_WIDGET(status),
+ 			 aWindow->width - 20,
+ 			 aWindow->height - 25);
+ #endif    
+     
  #ifdef GTK_ENABLED
+     XResizeWindow(GDK_WINDOW_XDISPLAY(gtkwidget->window),
+ 		  GDK_WINDOW_XWINDOW(gtkwidget->window),
+ 		  aWindow->width, aWindow->height);
+     XResizeWindow(display,
+ 		  window,
+ 		  aWindow->width, aWindow->height);
+     
      if (panel_drawn == 1 && mode == NP_FULL) {
  	if (panel_height >= 32) {
***************
*** 759,766 ****
  			   aWindow->height - height);
  	}
  	gtk_fixed_move(GTK_FIXED(fixed_container),
! 		       GTK_WIDGET(mediaprogress_bar),
! 		       (width * multiplier + 10),
! 		       aWindow->height - height + 2);
  
      }
--- 783,800 ----
  			   aWindow->height - height);
  	}
+ 	if (mediaprogress_bar != NULL) {
+ 	    gtk_fixed_move(GTK_FIXED(fixed_container),
+ 		       	   GTK_WIDGET(mediaprogress_bar),
+ 		           (width * multiplier + 10),
+ 		           aWindow->height - height + 2);
+ 	    gtk_widget_set_usize(GTK_WIDGET(mediaprogress_bar),
+ 			         aWindow->width -
+ 			         (width * (multiplier + 1) + 20),
+ 			         height - 4);
+ 	}
  	gtk_fixed_move(GTK_FIXED(fixed_container),
! 		       GTK_WIDGET(fs_event_box),
! 		       (aWindow->width - width),
! 		       aWindow->height - height);
  
      }