ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-09 19:41:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix surface dialog closing up when typing in the texture box

Browse source
This commit is contained in:
Timothee Besset 2013-11-26 20:45:15 +00:00
parent 10bcc6548f
commit 4d6d4d8f6c
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/surface/surfacedialog.cpp
View file

@ -364,6 +364,11 @@ static void GetTexdefInfo_from_Radiant(){
} }
static gint apply_and_hide( GtkWidget *widget, GdkEvent *event, gpointer data ) { static gint apply_and_hide( GtkWidget *widget, GdkEvent *event, gpointer data ) {
// we get all the key presses when the user is typing in the texture box - so make sure to not close then
if ( gtk_widget_is_focus( texture_combo_entry ) ) {
return FALSE;
}
if ( !texdef_face_list_empty() ) { if ( !texdef_face_list_empty() ) {
GetTexMods( TRUE ); GetTexMods( TRUE );
Sys_UpdateWindows( W_CAMERA ); Sys_UpdateWindows( W_CAMERA );
@ -1133,13 +1138,15 @@ GtkWidget* create_SurfaceInspector( void ){
g_signal_connect( (gpointer) SurfaceInspector, "destroy", g_signal_connect( (gpointer) SurfaceInspector, "destroy",
G_CALLBACK( gtk_widget_destroy ), G_CALLBACK( gtk_widget_destroy ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "key_press_event",
G_CALLBACK( apply_and_hide ),
NULL );
g_signal_connect( (gpointer) texture_combo_entry, "key_press_event", g_signal_connect( (gpointer) texture_combo_entry, "key_press_event",
G_CALLBACK( on_texture_combo_entry_key_press_event ), G_CALLBACK( on_texture_combo_entry_key_press_event ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "key_press_event",
G_CALLBACK( apply_and_hide ),
NULL );
g_signal_connect( (gpointer) texture_combo_entry, "activate", g_signal_connect( (gpointer) texture_combo_entry, "activate",
G_CALLBACK( on_texture_combo_entry_activate ), G_CALLBACK( on_texture_combo_entry_activate ),
NULL ); NULL );
@ -1199,8 +1206,7 @@ GtkWidget* create_SurfaceInspector( void ){
// Texture Combo // Texture Combo
gboolean on_texture_combo_entry_key_press_event( GtkWidget *widget, GdkEventKey *event, gboolean on_texture_combo_entry_key_press_event( GtkWidget *widget, GdkEventKey *event, gpointer user_data ){
gpointer user_data ){
// Have Tab activate selection as well as Return // Have Tab activate selection as well as Return
if ( event->keyval == GDK_Tab ) { if ( event->keyval == GDK_Tab ) {
g_signal_emit_by_name( texture_combo_entry, "activate" ); g_signal_emit_by_name( texture_combo_entry, "activate" );