changeset 42883:57c5f7f05f4c

xfns.c (x_set_frame_parameters): Just call x_fullscreen_adjust if fullscreen is being set.
author Jan Djärv <jan.h.d@swipnet.se>
date Mon, 21 Jan 2002 19:23:48 +0000
parents d213cb09a0f2
children 5abd84afe99c
files src/ChangeLog src/xfns.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jan 21 16:15:44 2002 +0000
+++ b/src/ChangeLog	Mon Jan 21 19:23:48 2002 +0000
@@ -1,3 +1,8 @@
+2002-01-21  Jan D.  <Jan.Djarv@mbox200.swipnet.se>
+
+	* xfns.c (x_set_frame_parameters): Just call x_fullscreen_adjust
+	if fullscreen is being set.
+
 2002-01-21  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* minibuf.c (Fminibuffer_contents)
--- a/src/xfns.c	Mon Jan 21 16:15:44 2002 +0000
+++ b/src/xfns.c	Mon Jan 21 19:23:48 2002 +0000
@@ -880,6 +880,7 @@
   int i, p;
   int left_no_change = 0, top_no_change = 0;
   int icon_left_no_change = 0, icon_top_no_change = 0;
+  int fullscreen_is_being_set = 0;
 
   struct gcpro gcpro1, gcpro2;
 
@@ -944,6 +945,7 @@
 	  register Lisp_Object param_index, old_value;
 
 	  old_value = get_frame_param (f, prop);
+ 	  fullscreen_is_being_set = EQ (prop, Qfullscreen);
 	  
 	  if (NILP (Fequal (val, old_value)))
 	    {
@@ -1034,7 +1036,7 @@
 	XSETINT (icon_top, 0);
     }
 
-  if (FRAME_VISIBLE_P (f))
+  if (FRAME_VISIBLE_P (f) && fullscreen_is_being_set)
     {
       /* If the frame is visible already and the fullscreen parameter is
          being set, it is too late to set WM manager hints to specify
@@ -1042,9 +1044,7 @@
          Here we first get the width, height and position that applies to
          fullscreen.  We then move the frame to the appropriate
          position.  Resize of the frame is taken care of in the code after
-         this if-statement.
-         If fullscreen is not specified, x_fullscreen_adjust returns
-         the current parameters and then x_fullscreen_move does nothing. */
+         this if-statement. */
       int new_left, new_top;
       
       x_fullscreen_adjust (f, &width, &height, &new_top, &new_left);