OBS User unknown 2007-02-26 18:03:06 +00:00 committed by Git OBS Bridge
parent 0f5527fa4d
commit 1eea348231
3 changed files with 75 additions and 2 deletions

View File

@ -0,0 +1,64 @@
https://bugzilla.novell.com/show_bug.cgi?id=211443
================================================================================
Index: src/terminal-window.c
===================================================================
--- src/terminal-window.c (revision 2081)
+++ src/terminal-window.c (revision 2082)
@@ -1613,8 +1613,22 @@
if (window->priv->active_term == screen)
return;
+ /* Workaround to remove gtknotebook's feature of computing its size based on
+ * all pages. When the widget is hidden, its size will not be taken into
+ * account.
+ */
+ if (window->priv->active_term)
+ {
+ GtkWidget *old_widget;
+ old_widget = terminal_screen_get_widget (window->priv->active_term);
+ gtk_widget_hide (old_widget);
+ }
+
widget = terminal_screen_get_widget (screen);
+ /* Make sure that the widget is no longer hidden due to the workaround */
+ gtk_widget_show (widget);
+
profile = terminal_screen_get_profile (screen);
if (!GTK_WIDGET_REALIZED (widget))
@@ -1705,11 +1719,7 @@
TerminalScreen *screen;
GtkWidget *menu_item;
int old_grid_width, old_grid_height;
- GtkWidget *old_widget;
-
- old_widget = NULL;
- old_grid_width = -1;
- old_grid_height = -1;
+ GtkWidget *old_widget, *new_widget;
if (window->priv->active_term == NULL)
return;
@@ -1725,17 +1735,13 @@
screen = TERMINAL_SCREEN (page_widget);
g_assert (screen);
+
+ /* This is so that we maintain the same grid */
+ new_widget = terminal_screen_get_widget (screen);
+ terminal_widget_set_size (new_widget, old_grid_width, old_grid_height);
terminal_window_set_active (window, screen);
- /* This is so we maintain the same grid moving among tabs with
- * different fonts.
- */
-#ifdef DEBUG_GEOMETRY
- g_fprintf (stderr,"setting size in switch_page handler\n");
-#endif
- terminal_window_set_size_force_grid (window, screen, TRUE, old_grid_width, old_grid_height);
-
update_tab_sensitivity (window);
menu_item = screen_get_menuitem (screen);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 26 13:26:29 CET 2007 - sbrabec@suse.cz
- Fixed invalid window resize (#211443).
-------------------------------------------------------------------
Wed Jan 17 18:25:00 CET 2007 - sbrabec@suse.cz

View File

@ -16,7 +16,7 @@ License: GNU General Public License (GPL), GNU Library General Public Lic
Group: System/X11/Terminals
Obsoletes: gnome-core
Version: 2.16.1
Release: 37
Release: 41
Summary: The GNOME 2.x Desktop Terminal
Source: %{name}-%{version}.tar.bz2
URL: http://www.gnome.org
@ -26,6 +26,7 @@ Patch1: gnome-terminal-defaults.patch
Patch2: gnome-terminal-force-terminal-draw.patch
Patch4: gnome-terminal-desktop.patch
Patch5: %{name}-uninited-vars.patch
Patch6: gnome-terminal-tab_resize_fix_r2082.patch
Autoreqprov: on
%gconf_schemas_prereq
@ -42,6 +43,7 @@ handy for quick tasks on the command line.
%patch2 -p1
%patch4 -p1
%patch5
%patch6
%build
autoreconf -f -i
@ -89,7 +91,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/pixmaps/gnome-terminal.png
%{_libdir}/bonobo/servers/gnome-terminal.server
%changelog -n gnome-terminal
%changelog
* Mon Feb 26 2007 - sbrabec@suse.cz
- Fixed invalid window resize (#211443).
* Wed Jan 17 2007 - sbrabec@suse.cz
- Removed obsolete scrollkeeper directory (#230786).
* Tue Dec 19 2006 - sbrabec@suse.cz