Fixed carsh on keypresses in icon view, added item activation on enter

This commit is contained in:
Lauris Kaplinski 2002-03-10 15:04:22 +00:00
parent ed6922aae0
commit 0335c74339
3 changed files with 18 additions and 3 deletions

View file

@ -27,6 +27,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include <string.h>
#include <gnome.h> #include <gnome.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h> #include <glade/glade.h>

View file

@ -331,7 +331,7 @@ static void
select_icon_list_cb (GtkWidget *widget, gint arg1, GdkEvent *event, select_icon_list_cb (GtkWidget *widget, gint arg1, GdkEvent *event,
CappletDirView *view) CappletDirView *view)
{ {
if (event->type == GDK_2BUTTON_PRESS && if (event && event->type == GDK_2BUTTON_PRESS &&
((GdkEventButton *) event)->button == 1) ((GdkEventButton *) event)->button == 1)
{ {
capplet_dir_entry_activate capplet_dir_entry_activate
@ -342,6 +342,17 @@ select_icon_list_cb (GtkWidget *widget, gint arg1, GdkEvent *event,
} }
} }
static gboolean
cdvl_key_press (GtkWidget *widget, GdkEventKey *event, CappletDirView *view)
{
if ((event->keyval == GDK_Return) && (view->selected)) {
capplet_dir_entry_activate (view->selected, view);
return TRUE;
}
return FALSE;
}
void void
lighten_color (GdkColor *color) lighten_color (GdkColor *color)
{ {
@ -510,6 +521,9 @@ list_create (CappletDirView *view)
(GCallback) select_icon_list_cb, (GCallback) select_icon_list_cb,
view); view);
g_signal_connect (G_OBJECT (w), "key_press_event",
G_CALLBACK (cdvl_key_press), view);
gtk_container_add (GTK_CONTAINER (sw), w); gtk_container_add (GTK_CONTAINER (sw), w);
gtk_paned_add2 (GTK_PANED (hbox), sw); gtk_paned_add2 (GTK_PANED (hbox), sw);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);

View file

@ -824,8 +824,8 @@ render_to_screen (BGApplier *bg_applier, const BGPreferences *prefs)
bg_applier->p->render_geom.height); bg_applier->p->render_geom.height);
} }
else if (bg_applier->p->type == BG_APPLIER_ROOT) { else if (bg_applier->p->type == BG_APPLIER_ROOT) {
gdk_window_set_back_pixmap (GDK_ROOT_PARENT (), NULL, FALSE); gdk_window_set_back_pixmap (gdk_get_default_root_window (), NULL, FALSE);
gdk_window_set_background (GDK_ROOT_PARENT (), prefs->color1); gdk_window_set_background (gdk_get_default_root_window (), prefs->color1);
} }
} }
} }