p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Make the symbol menu grab focus. 

This way when the user clicks outside the menu when it is open,
the menu will close itself first.

Keyboard input is however still not handled.

The symbol menu should be redesigned.
This commit is contained in:
Přemysl Eric Janouch 2010-12-18 04:51:25 +01:00
parent 86e73f86c2
commit f2f308f2f5
1 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ld-window-main.c
View File

@ -60,6 +60,7 @@ struct _SymbolMenuData
{ {
gulong expose_handler; gulong expose_handler;
gulong motion_notify_handler; gulong motion_notify_handler;
gulong button_press_handler;
gulong button_release_handler; gulong button_release_handler;
GtkToggleButton *active_button; GtkToggleButton *active_button;
@ -118,6 +119,8 @@ static gboolean on_canvas_exposed (GtkWidget *widget,
GdkEventExpose *event, gpointer user_data); GdkEventExpose *event, gpointer user_data);
static gboolean on_canvas_motion_notify (GtkWidget *widget, static gboolean on_canvas_motion_notify (GtkWidget *widget,
GdkEventMotion *event, gpointer user_data); GdkEventMotion *event, gpointer user_data);
static gboolean on_canvas_button_press (GtkWidget *widget,
GdkEventButton *event, gpointer user_data);
static gboolean on_canvas_button_release (GtkWidget *widget, static gboolean on_canvas_button_release (GtkWidget *widget,
GdkEventButton *event, gpointer user_data); GdkEventButton *event, gpointer user_data);
@ -316,6 +319,8 @@ ld_window_main_init (LdWindowMain *self)
"expose-event", G_CALLBACK (on_canvas_exposed), self); "expose-event", G_CALLBACK (on_canvas_exposed), self);
priv->symbol_menu.motion_notify_handler = g_signal_connect (priv->canvas, priv->symbol_menu.motion_notify_handler = g_signal_connect (priv->canvas,
"motion-notify-event", G_CALLBACK (on_canvas_motion_notify), self); "motion-notify-event", G_CALLBACK (on_canvas_motion_notify), self);
priv->symbol_menu.button_press_handler = g_signal_connect (priv->canvas,
"button-press-event", G_CALLBACK (on_canvas_button_press), self);
priv->symbol_menu.button_release_handler = g_signal_connect (priv->canvas, priv->symbol_menu.button_release_handler = g_signal_connect (priv->canvas,
"button-release-event", G_CALLBACK (on_canvas_button_release), self); "button-release-event", G_CALLBACK (on_canvas_button_release), self);
@ -324,6 +329,8 @@ ld_window_main_init (LdWindowMain *self)
priv->symbol_menu.expose_handler); priv->symbol_menu.expose_handler);
g_signal_handler_block (priv->canvas, g_signal_handler_block (priv->canvas,
priv->symbol_menu.motion_notify_handler); priv->symbol_menu.motion_notify_handler);
g_signal_handler_block (priv->canvas,
priv->symbol_menu.button_press_handler);
g_signal_handler_block (priv->canvas, g_signal_handler_block (priv->canvas,
priv->symbol_menu.button_release_handler); priv->symbol_menu.button_release_handler);
@ -551,6 +558,8 @@ on_category_toggle (GtkToggleButton *toggle_button, gpointer user_data)
priv->symbol_menu.expose_handler); priv->symbol_menu.expose_handler);
g_signal_handler_block (priv->canvas, g_signal_handler_block (priv->canvas,
priv->symbol_menu.motion_notify_handler); priv->symbol_menu.motion_notify_handler);
g_signal_handler_block (priv->canvas,
priv->symbol_menu.button_press_handler);
g_signal_handler_block (priv->canvas, g_signal_handler_block (priv->canvas,
priv->symbol_menu.button_release_handler); priv->symbol_menu.button_release_handler);
@ -563,6 +572,8 @@ on_category_toggle (GtkToggleButton *toggle_button, gpointer user_data)
g_free (data->items); g_free (data->items);
data->items = NULL; data->items = NULL;
gtk_grab_remove (GTK_WIDGET (self->priv->canvas));
} }
else else
{ {
@ -580,6 +591,8 @@ on_category_toggle (GtkToggleButton *toggle_button, gpointer user_data)
priv->symbol_menu.expose_handler); priv->symbol_menu.expose_handler);
g_signal_handler_unblock (priv->canvas, g_signal_handler_unblock (priv->canvas,
priv->symbol_menu.motion_notify_handler); priv->symbol_menu.motion_notify_handler);
g_signal_handler_unblock (priv->canvas,
priv->symbol_menu.button_press_handler);
g_signal_handler_unblock (priv->canvas, g_signal_handler_unblock (priv->canvas,
priv->symbol_menu.button_release_handler); priv->symbol_menu.button_release_handler);
@ -616,6 +629,8 @@ on_category_toggle (GtkToggleButton *toggle_button, gpointer user_data)
menu_width += item++->width; menu_width += item++->width;
} }
data->menu_width = menu_width; data->menu_width = menu_width;
gtk_grab_add (GTK_WIDGET (self->priv->canvas));
} }
redraw_symbol_menu (self); redraw_symbol_menu (self);
} }
@ -687,7 +702,8 @@ on_canvas_motion_notify (GtkWidget *widget, GdkEventMotion *event,
self = LD_WINDOW_MAIN (user_data); self = LD_WINDOW_MAIN (user_data);
data = &self->priv->symbol_menu; data = &self->priv->symbol_menu;
if (event->x < 0 || event->y < data->menu_y if (widget->window != event->window
|| event->x < 0 || event->y < data->menu_y
|| event->y >= data->menu_y + data->menu_height) || event->y >= data->menu_y + data->menu_height)
{ {
data->active_item = -1; data->active_item = -1;
@ -711,6 +727,27 @@ on_canvas_motion_notify (GtkWidget *widget, GdkEventMotion *event,
return FALSE; return FALSE;
} }
static gboolean
on_canvas_button_press (GtkWidget *widget, GdkEventButton *event,
gpointer user_data)
{
LdWindowMain *self;
SymbolMenuData *data;
self = LD_WINDOW_MAIN (user_data);
data = &self->priv->symbol_menu;
/* The event occured elsewhere, cancel the menu and put the event
* back into the queue.
*/
if (widget->window != event->window && data->active_button)
{
gtk_toggle_button_set_active (data->active_button, FALSE);
gdk_event_put ((GdkEvent *) event);
}
return FALSE;
}
static gboolean static gboolean
on_canvas_button_release (GtkWidget *widget, GdkEventButton *event, on_canvas_button_release (GtkWidget *widget, GdkEventButton *event,
gpointer user_data) gpointer user_data)