SF.net SVN: geany: [1030] trunk

[ntrel at users.sourceforge.net]

Revision: 1030
          http://svn.sourceforge.net/geany/?rev=1030&view=rev
Author:   ntrel
Date:     2006-11-25 04:23:49 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
Remove vte_char_size_changed() workaround, not needed since r988;
this also fixes an issue where the VTE is limited to 30x5 chars.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/vte.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-25 12:17:50 UTC (rev 1029)
+++ trunk/ChangeLog	2006-11-25 12:23:49 UTC (rev 1030)
@@ -3,6 +3,9 @@
  * src/msgwindow.c, src/notebook.c, src/msgwindow.h, src/notebook.h:
    Add some const char* argument modifiers, remove unneeded static from
    some local vars.
+ * src/vte.c:
+   Remove vte_char_size_changed() workaround, not needed since r988;
+   this also fixes an issue where the VTE is limited to 30x5 chars.
 
 
 2006-11-24  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2006-11-25 12:17:50 UTC (rev 1029)
+++ trunk/src/vte.c	2006-11-25 12:23:49 UTC (rev 1030)
@@ -58,8 +58,6 @@
 static void vte_register_symbols(GModule *module);
 static void vte_popup_menu_clicked(GtkMenuItem *menuitem, gpointer user_data);
 static GtkWidget *vte_create_popup_menu(void);
-static void vte_char_size_changed(VteTerminal *vteterminal, guint arg1, guint arg2,
-	gpointer user_data);
 
 
 /* taken from anjuta, thanks */
@@ -151,8 +149,11 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vte, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0);
 
+	/* set the default widget size first to prevent VTE expanding too much,
+	 * sometimes causing the hscrollbar to be too big or out of view. */
 	gtk_widget_set_size_request(GTK_WIDGET(vte), 10, 10);
 	vf->vte_terminal_set_size(VTE_TERMINAL(vte), 30, 1);
+
 	//vf->vte_terminal_set_encoding(VTE_TERMINAL(vte), "UTF-8");
 	vf->vte_terminal_set_mouse_autohide(VTE_TERMINAL(vte), TRUE);
 	vf->vte_terminal_set_word_chars(VTE_TERMINAL(vte), VTE_WORDCHARS);
@@ -160,8 +161,6 @@
 	g_signal_connect(G_OBJECT(vte), "child-exited", G_CALLBACK(vte_start), NULL);
 	g_signal_connect(G_OBJECT(vte), "button-press-event", G_CALLBACK(vte_button_pressed), NULL);
 	g_signal_connect(G_OBJECT(vte), "event", G_CALLBACK(vte_keypress), NULL);
-	g_signal_connect(G_OBJECT(vte), "char-size-changed",
-		G_CALLBACK(vte_char_size_changed), NULL);
 	//g_signal_connect(G_OBJECT(vte), "drag-data-received", G_CALLBACK(vte_drag_data_received), NULL);
 	//g_signal_connect(G_OBJECT(vte), "drag-drop", G_CALLBACK(vte_drag_drop), NULL);
 
@@ -252,17 +251,6 @@
 }
 
 
-static void vte_char_size_changed(VteTerminal *vteterminal, guint arg1, guint arg2,
-	gpointer user_data)
-{
-	/* Now the font may have changed, we must limit the width, otherwise the
-	 * vertical scroll bar will disappear e.g. for Monospace > 10.
-	 * We don't want to set height, but there's no way to set just width, so say 5.
-	 * The VTE will be safely enlarged by GTK, above 30, 5 after this callback. */
-	vf->vte_terminal_set_size(VTE_TERMINAL(vc->vte), 30, 5);
-}
-
-
 static void vte_register_symbols(GModule *mod)
 {
 	g_module_symbol(mod, "vte_terminal_new", (void*)&vf->vte_terminal_new);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.