procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 09:23:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: display shell popup menu now uses GMenuModel.

Browse source 
The menu is still very incomplete, but it's a start.
This commit is contained in:
Jehan 2023-02-22 19:58:43 +01:00
parent 8ec589915a
commit f9fec03751
7 changed files with 85 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/display/gimpdisplayshell-tool-events.c
View file

@ -286,7 +286,8 @@ gimp_display_shell_canvas_no_image_events (GtkWidget *canvas,
if (gdk_event_triggers_context_menu (event)) if (gdk_event_triggers_context_menu (event))
{ {
gimp_ui_manager_ui_popup_at_pointer (shell->popup_manager, gimp_ui_manager_ui_popup_at_pointer (shell->popup_manager,
"/dummy-menubar/image-popup", "/image-menubar",
GTK_WIDGET (shell),
(GdkEvent *) event, (GdkEvent *) event,
NULL, NULL); NULL, NULL);
return TRUE; return TRUE;
@ -2467,11 +2468,12 @@ gimp_display_triggers_context_menu (const GdkEvent *event,
if (! ui_manager) if (! ui_manager)
{ {
ui_manager = shell->popup_manager; ui_manager = shell->popup_manager;
ui_path = "/dummy-menubar/image-popup"; ui_path = "/image-menubar";
} }
gimp_ui_manager_ui_popup_at_pointer (ui_manager, ui_path, event, gimp_ui_manager_ui_popup_at_pointer (ui_manager, ui_path,
NULL, NULL); GTK_WIDGET (shell),
event, NULL, NULL);
return TRUE; return TRUE;
} }
} }

2
app/display/gimpdisplayshell.c
View file

@ -988,7 +988,7 @@ gimp_display_shell_popup_menu (GtkWidget *widget)
shell->display); shell->display);
gimp_ui_manager_ui_popup_at_widget (shell->popup_manager, gimp_ui_manager_ui_popup_at_widget (shell->popup_manager,
"/dummy-menubar/image-popup", "/image-menubar",
shell->origin, shell->origin,
GDK_GRAVITY_EAST, GDK_GRAVITY_EAST,
GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST,

3
app/menus/image-menu.c
View file

@ -38,9 +38,6 @@ image_menu_setup (GimpUIManager *manager,
{ {
gchar *path; gchar *path;
if (! strcmp (ui_path, "/dummy-menubar"))
ui_path = "/dummy-menubar/image-popup";
file_menu_setup (manager, ui_path); file_menu_setup (manager, ui_path);
windows_menu_setup (manager, ui_path); windows_menu_setup (manager, ui_path);
plug_in_menus_setup (manager, ui_path); plug_in_menus_setup (manager, ui_path);

2
app/menus/menus.c
View file

@ -98,8 +98,6 @@ menus_init (Gimp *gimp,
NULL, NULL,
"/image-menubar", "/image-menubar",
"image-menu", image_menu_setup, "image-menu", image_menu_setup,
"/dummy-menubar",
"image-menu", image_menu_setup,
"/quick-mask-popup", "/quick-mask-popup",
"quick-mask-menu", NULL, "quick-mask-menu", NULL,
NULL); NULL);

5
app/widgets/gimpeditor.c
View file

@ -483,7 +483,7 @@ gimp_editor_popup_menu_at_pointer (GimpEditor *editor,
{ {
gimp_ui_manager_update (editor->priv->ui_manager, editor->priv->popup_data); gimp_ui_manager_update (editor->priv->ui_manager, editor->priv->popup_data);
gimp_ui_manager_ui_popup_at_pointer (editor->priv->ui_manager, editor->priv->ui_path, gimp_ui_manager_ui_popup_at_pointer (editor->priv->ui_manager, editor->priv->ui_path,
trigger_event, NULL, NULL); GTK_WIDGET (editor), trigger_event, NULL, NULL);
return TRUE; return TRUE;
} }
@ -504,7 +504,8 @@ gimp_editor_popup_menu_at_rect (GimpEditor *editor,
{ {
gimp_ui_manager_update (editor->priv->ui_manager, editor->priv->popup_data); gimp_ui_manager_update (editor->priv->ui_manager, editor->priv->popup_data);
gimp_ui_manager_ui_popup_at_rect (editor->priv->ui_manager, editor->priv->ui_path, gimp_ui_manager_ui_popup_at_rect (editor->priv->ui_manager, editor->priv->ui_path,
window, rect, rect_anchor, menu_anchor, GTK_WIDGET (editor), window,
rect, rect_anchor, menu_anchor,
trigger_event, NULL, NULL); trigger_event, NULL, NULL);
return TRUE; return TRUE;
} }

100
app/widgets/gimpuimanager.c
View file

@ -97,10 +97,6 @@ static gboolean gimp_ui_manager_entry_load (GimpUIManager *manager,
static GimpUIManagerUIEntry * static GimpUIManagerUIEntry *
gimp_ui_manager_entry_ensure (GimpUIManager *manager, gimp_ui_manager_entry_ensure (GimpUIManager *manager,
const gchar *path); const gchar *path);
static void gimp_ui_manager_menu_position (GtkMenu *menu,
gint *x,
gint *y,
gpointer data);
static void gimp_ui_manager_delete_popdown_data (GtkWidget *widget, static void gimp_ui_manager_delete_popdown_data (GtkWidget *widget,
GimpUIManager *manager); GimpUIManager *manager);
static void gimp_ui_manager_item_realize (GtkWidget *widget, static void gimp_ui_manager_item_realize (GtkWidget *widget,
@ -116,6 +112,8 @@ static GtkWidget *find_widget_under_pointer (GdkWindow *window,
gint *x, gint *x,
gint *y); gint *y);
static void gimp_ui_manager_fill_model (GimpUIManager *manager,
GMenuModel *model);
static void gimp_ui_manager_menu_item_free (GimpUIManagerMenuItem *item); static void gimp_ui_manager_menu_item_free (GimpUIManagerMenuItem *item);
@ -522,8 +520,13 @@ gimp_ui_manager_get_model (GimpUIManager *manager,
full_basename, NULL); full_basename, NULL);
if (entry->builder == NULL) if (entry->builder == NULL)
/* The model is owned by the builder which I have to keep around. */ {
entry->builder = gtk_builder_new_from_file (filename); /* The model is owned by the builder which I have to keep around. */
entry->builder = gtk_builder_new_from_file (filename);
gimp_ui_manager_fill_model (manager,
G_MENU_MODEL (gtk_builder_get_object (entry->builder, path)));
}
model = G_MENU_MODEL (gtk_builder_get_object (entry->builder, path)); model = G_MENU_MODEL (gtk_builder_get_object (entry->builder, path));
g_free (filename); g_free (filename);
@ -725,22 +728,20 @@ gimp_ui_manager_ui_popup_at_widget (GimpUIManager *manager,
GDestroyNotify popdown_func, GDestroyNotify popdown_func,
gpointer popdown_data) gpointer popdown_data)
{ {
GtkWidget *menu; GMenuModel *model;
GtkWidget *menu;
g_return_if_fail (GIMP_IS_UI_MANAGER (manager)); g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
g_return_if_fail (ui_path != NULL); g_return_if_fail (ui_path != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
menu = gimp_ui_manager_get_widget (manager, ui_path); model = gimp_ui_manager_get_model (manager, ui_path);
menu = gtk_menu_new_from_model (model);
if (GTK_IS_MENU_ITEM (menu)) gtk_menu_attach_to_widget (GTK_MENU (menu), widget, NULL);
menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
if (! menu) if (! menu)
return; return;
g_return_if_fail (GTK_IS_MENU (menu));
if (popdown_func && popdown_data) if (popdown_func && popdown_data)
{ {
g_object_set_data_full (G_OBJECT (manager), "popdown-data", g_object_set_data_full (G_OBJECT (manager), "popdown-data",
@ -759,25 +760,24 @@ gimp_ui_manager_ui_popup_at_widget (GimpUIManager *manager,
void void
gimp_ui_manager_ui_popup_at_pointer (GimpUIManager *manager, gimp_ui_manager_ui_popup_at_pointer (GimpUIManager *manager,
const gchar *ui_path, const gchar *ui_path,
GtkWidget *attached_widget,
const GdkEvent *trigger_event, const GdkEvent *trigger_event,
GDestroyNotify popdown_func, GDestroyNotify popdown_func,
gpointer popdown_data) gpointer popdown_data)
{ {
GtkWidget *menu; GMenuModel *model;
GtkWidget *menu;
g_return_if_fail (GIMP_IS_UI_MANAGER (manager)); g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
g_return_if_fail (ui_path != NULL); g_return_if_fail (ui_path != NULL);
menu = gimp_ui_manager_get_widget (manager, ui_path); model = gimp_ui_manager_get_model (manager, ui_path);
menu = gtk_menu_new_from_model (model);
if (GTK_IS_MENU_ITEM (menu)) gtk_menu_attach_to_widget (GTK_MENU (menu), attached_widget, NULL);
menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
if (! menu) if (! menu)
return; return;
g_return_if_fail (GTK_IS_MENU (menu));
if (popdown_func && popdown_data) if (popdown_func && popdown_data)
{ {
g_object_set_data_full (G_OBJECT (manager), "popdown-data", g_object_set_data_full (G_OBJECT (manager), "popdown-data",
@ -793,6 +793,7 @@ gimp_ui_manager_ui_popup_at_pointer (GimpUIManager *manager,
void void
gimp_ui_manager_ui_popup_at_rect (GimpUIManager *manager, gimp_ui_manager_ui_popup_at_rect (GimpUIManager *manager,
const gchar *ui_path, const gchar *ui_path,
GtkWidget *attached_widget,
GdkWindow *window, GdkWindow *window,
const GdkRectangle *rect, const GdkRectangle *rect,
GdkGravity rect_anchor, GdkGravity rect_anchor,
@ -801,21 +802,19 @@ gimp_ui_manager_ui_popup_at_rect (GimpUIManager *manager,
GDestroyNotify popdown_func, GDestroyNotify popdown_func,
gpointer popdown_data) gpointer popdown_data)
{ {
GtkWidget *menu; GMenuModel *model;
GtkWidget *menu;
g_return_if_fail (GIMP_IS_UI_MANAGER (manager)); g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
g_return_if_fail (ui_path != NULL); g_return_if_fail (ui_path != NULL);
menu = gimp_ui_manager_get_widget (manager, ui_path); model = gimp_ui_manager_get_model (manager, ui_path);
menu = gtk_menu_new_from_model (model);
if (GTK_IS_MENU_ITEM (menu)) gtk_menu_attach_to_widget (GTK_MENU (menu), attached_widget, NULL);
menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
if (! menu) if (! menu)
return; return;
g_return_if_fail (GTK_IS_MENU (menu));
if (popdown_func && popdown_data) if (popdown_func && popdown_data)
{ {
g_object_set_data_full (G_OBJECT (manager), "popdown-data", g_object_set_data_full (G_OBJECT (manager), "popdown-data",
@ -1413,6 +1412,53 @@ find_widget_under_pointer (GdkWindow *window,
return event_widget; return event_widget;
} }
static void
gimp_ui_manager_fill_model (GimpUIManager *manager,
GMenuModel *model)
{
gint n_items;
g_return_if_fail (G_IS_MENU_MODEL (model));
n_items = g_menu_model_get_n_items (model);
for (int i = 0; i < n_items; i++)
{
GMenuModel *subsection;
GMenuModel *submenu;
gchar *label = NULL;
gchar *action_name = NULL;
subsection = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION);
submenu = g_menu_model_get_item_link (model, i, G_MENU_LINK_SUBMENU);
g_menu_model_get_item_attribute (model, i, G_MENU_ATTRIBUTE_LABEL, "s", &label);
g_menu_model_get_item_attribute (model, i, G_MENU_ATTRIBUTE_ACTION, "s", &action_name);
if (subsection != NULL)
{
gimp_ui_manager_fill_model (manager, subsection);
}
else if (submenu != NULL)
{
gimp_ui_manager_fill_model (manager, submenu);
}
else if (action_name != NULL)
{
/* Update the label, unless it's a placeholder (no action name). */
GApplication *app;
GAction *action;
app = manager->gimp->app;
action = g_action_map_lookup_action (G_ACTION_MAP (app), action_name + 4);
g_menu_remove (G_MENU (model), i);
g_menu_insert (G_MENU (model), i,
gimp_action_get_label (GIMP_ACTION (action)),
action_name);
}
g_free (label);
g_free (action_name);
}
}
static void static void
gimp_ui_manager_menu_item_free (GimpUIManagerMenuItem *item) gimp_ui_manager_menu_item_free (GimpUIManagerMenuItem *item)
{ {

2
app/widgets/gimpuimanager.h
View file

@ -164,12 +164,14 @@ void gimp_ui_manager_ui_popup_at_widget
void gimp_ui_manager_ui_popup_at_pointer void gimp_ui_manager_ui_popup_at_pointer
(GimpUIManager *manager, (GimpUIManager *manager,
const gchar *ui_path, const gchar *ui_path,
GtkWidget *attached_widget,
const GdkEvent *trigger_event, const GdkEvent *trigger_event,
GDestroyNotify popdown_func, GDestroyNotify popdown_func,
gpointer popdown_data); gpointer popdown_data);
void gimp_ui_manager_ui_popup_at_rect void gimp_ui_manager_ui_popup_at_rect
(GimpUIManager *manager, (GimpUIManager *manager,
const gchar *ui_path, const gchar *ui_path,
GtkWidget *attached_widget,
GdkWindow *window, GdkWindow *window,
const GdkRectangle *rect, const GdkRectangle *rect,
GdkGravity rect_anchor, GdkGravity rect_anchor,