vim: src/gui.c comparison

comparison src/gui.c @ 811:d2c169a725c8

updated for version 7.0c01

author	vimboss
date	Mon, 27 Mar 2006 20:55:21 +0000
parents	9f345c48220b
children	23f82b5d2814

comparison

equal deleted inserted replaced

-:9f345c48220b
+:d2c169a725c8
 gui.shell_created = TRUE;
 #ifndef FEAT_GUI_GTK
 /* Set the shell size, adjusted for the screen size.  For GTK this only
 * works after the shell has been opened, thus it is further down. */
-gui_set_shellsize(FALSE, TRUE);
+gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
 #endif
 #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
 /* Need to set the size of the menubar after all the menus have been
 * created. */
 gui_mch_compute_menu_height((Widget)0);
 #endif
 #if defined(FEAT_GUI_GTK)
 	/* Give GTK+ a chance to put all widget's into place. */
 	gui_mch_update();
 	/* Now make sure the shell fits on the screen. */
-	gui_set_shellsize(FALSE, TRUE);
+	gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
 #endif
 	/* When 'lines' was set while starting up the topframe may have to be
 	 * resized. */
 	win_new_shellsize();
 #ifdef MSWIN
 		TRUE
 #else
 		FALSE
 #endif
-		);
+		, RESIZE_BOTH);
 }
 return ret;
 }
 * If "fit_to_display" is TRUE then the size may be reduced to fit the window
 * on the screen.
 */
 /*ARGSUSED*/
 void
-gui_set_shellsize(mustset, fit_to_display)
+gui_set_shellsize(mustset, fit_to_display, direction)
 int		mustset;		/* set by the user */
 int		fit_to_display;
+int		direction;		/* RESIZE_HOR, RESIZE_VER */
 {
 int		base_width;
 int		base_height;
 int		width;
 int		height;
 }
 if (fit_to_display)
 {
 	gui_mch_get_screen_dimensions(&screen_w, &screen_h);
-	if (width > screen_w)
+	if ((direction & RESIZE_HOR) && width > screen_w)
 	{
 	    Columns = (screen_w - base_width) / gui.char_width;
 	    if (Columns < MIN_COLUMNS)
 		Columns = MIN_COLUMNS;
 	    width = Columns * gui.char_width + base_width;
 	}
-	if (height > screen_h)
+	if ((direction & RESIZE_VERT) && height > screen_h)
 	{
 	    Rows = (screen_h - base_height) / gui.char_height;
 	    check_shellsize();
 	    height = Rows * gui.char_height + base_height;
 	}
 # ifdef FEAT_WINDOWS
 min_height += tabline_height() * gui.char_height;
 # endif
 gui_mch_set_shellsize(width, height, min_width, min_height,
-						     base_width, base_height);
+					  base_width, base_height, direction);
 if (fit_to_display)
 {
 	int	    x, y;
 	/* Some window managers put the Vim window left of/above the screen. */
 add_long_to_buf((long_u)menu, bytes);
 add_to_input_buf_csi(bytes, sizeof(long_u));
 }
 #endif
-#ifndef FEAT_WINDOWS
+static int	prev_which_scrollbars[3];
-static int		    prev_which_scrollbars[3];
-#endif
 /*
 * Set which components are present.
 * If "oldval" is not NULL, "oldval" is the previous value, the new value is
 * in p_go.
 		break;
 	}
 if (gui.in_use)
 {
-	need_set_size = FALSE;
+	need_set_size = 0;
 	fix_size = FALSE;
 #ifdef FEAT_GUI_TABLINE
 	/* Update the GUI tab line, it may appear or disappear.  This may
 	 * cause the non-GUI tab line to disappear or appear. */
 	    /* We don't want a resize event change "Rows" here, save and
 	     * restore it.  Resizing is handled below. */
 	    i = Rows;
 	    gui_update_tabline();
 	    Rows = i;
-	    need_set_size = TRUE;
+	    need_set_size = RESIZE_VERT;
 	    if (using_tabline)
 		fix_size = TRUE;
 	    if (!gui_use_tabline())
 		redraw_tabline = TRUE;    /* may draw non-GUI tab line */
 	}
 #endif
 	for (i = 0; i < 3; i++)
 	{
-	    if (gui.which_scrollbars[i] !=
+	    /* The scrollbar needs to be updated when it is shown/unshown and
+	     * when switching tab pages.  But the size only changes when it's
+	     * shown/unshown.  Thus we need two places to remember whether a
+	     * scrollbar is there or not. */
+	    if (gui.which_scrollbars[i] != prev_which_scrollbars[i]
 #ifdef FEAT_WINDOWS
-		    curtab->tp_prev_which_scrollbars[i]
+		    || gui.which_scrollbars[i]
-#else
+					!= curtab->tp_prev_which_scrollbars[i]
-		    prev_which_scrollbars[i]
 #endif
 		    )
 	    {
 		if (i == SBAR_BOTTOM)
 		    gui_mch_enable_scrollbar(&gui.bottom_sbar,
 		    FOR_ALL_WINDOWS(wp)
 		    {
 			gui_do_scrollbar(wp, i, gui.which_scrollbars[i]);
 		    }
 		}
-		need_set_size = TRUE;
+		if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
-		if (gui.which_scrollbars[i])
+		{
-		    fix_size = TRUE;
+		    if (i == SBAR_BOTTOM)
+			need_set_size = RESIZE_VERT;
+		    else
+			need_set_size = RESIZE_HOR;
+		    if (gui.which_scrollbars[i])
+			fix_size = TRUE;
+		}
 	    }
 #ifdef FEAT_WINDOWS
-	    curtab->tp_prev_which_scrollbars[i]
+	    curtab->tp_prev_which_scrollbars[i] = gui.which_scrollbars[i];
-#else
+#endif
-	    prev_which_scrollbars[i]
+	    prev_which_scrollbars[i] = gui.which_scrollbars[i];
-#endif
-						= gui.which_scrollbars[i];
 	}
 #ifdef FEAT_MENU
 	if (gui.menu_is_active != prev_menu_is_active)
 	{
 	     * restore it.  Resizing is handled below. */
 	    i = Rows;
 	    gui_mch_enable_menu(gui.menu_is_active);
 	    Rows = i;
 	    prev_menu_is_active = gui.menu_is_active;
-	    need_set_size = TRUE;
+	    need_set_size = RESIZE_VERT;
 	    if (gui.menu_is_active)
 		fix_size = TRUE;
 	}
 #endif
 #ifdef FEAT_TOOLBAR
 	if (using_toolbar != prev_toolbar)
 	{
 	    gui_mch_show_toolbar(using_toolbar);
 	    prev_toolbar = using_toolbar;
-	    need_set_size = TRUE;
+	    need_set_size = RESIZE_VERT;
 	    if (using_toolbar)
 		fix_size = TRUE;
 	}
 #endif
 #ifdef FEAT_FOOTER
 	if (using_footer != prev_footer)
 	{
 	    gui_mch_enable_footer(using_footer);
 	    prev_footer = using_footer;
-	    need_set_size = TRUE;
+	    need_set_size = RESIZE_VERT;
 	    if (using_footer)
 		fix_size = TRUE;
 	}
 #endif
 #if defined(FEAT_MENU) && !defined(WIN16) && !(defined(WIN3264) && !defined(FEAT_TEAROFF))
 	    long    c = Columns;
 #endif
 	    /* Adjust the size of the window to make the text area keep the
 	     * same size and to avoid that part of our window is off-screen
 	     * and a scrollbar can't be used, for example. */
-	    gui_set_shellsize(FALSE, fix_size);
+	    gui_set_shellsize(FALSE, fix_size, need_set_size);
 #ifdef FEAT_GUI_GTK
 	    /* GTK has the annoying habit of sending us resize events when
 	     * changing the window size ourselves.  This mostly happens when
 	     * waiting for a character to arrive, quite unpredictably, and may
 	    gui_mch_update_tabline();
 	/* When the tabs change from hidden to shown or from shown to
 	 * hidden the size of the text area should remain the same. */
 	if (!showit != !shown)
-	    gui_set_shellsize(FALSE, showit);
+	    gui_set_shellsize(FALSE, showit, RESIZE_VERT);
 }
 }
 /*
 * Get the label for tab page "tp" into NameBuff[].

Mercurial > vim

comparison src/gui.c @ 811:d2c169a725c8