Commit 1f81c83f authored by Matthias Clasen's avatar Matthias Clasen

Add GtkPopoverMenu

GtkPopoverMenu is a GtkPopover subclass that has a menu-like stack
built-in.
parent a8cc4787
......@@ -406,6 +406,7 @@ gtk_public_h_sources = \
gtkplacessidebar.h \
gtkplug.h \
gtkpopover.h \
gtkpopovermenu.h \
gtkprintcontext.h \
gtkprintoperation.h \
gtkprintoperationpreview.h \
......@@ -1008,6 +1009,7 @@ gtk_base_c_sources = \
gtkprogressbar.c \
gtkpixelcache.c \
gtkpopover.c \
gtkpopovermenu.c \
gtkradiobutton.c \
gtkradiomenuitem.c \
gtkradiotoolbutton.c \
......
......@@ -153,6 +153,7 @@
#include <gtk/gtkpaned.h>
#include <gtk/gtkplacessidebar.h>
#include <gtk/gtkpopover.h>
#include <gtk/gtkpopovermenu.h>
#include <gtk/gtkprintcontext.h>
#include <gtk/gtkprintoperation.h>
#include <gtk/gtkprintoperationpreview.h>
......
......@@ -51,6 +51,7 @@
#include "gtkwidgetpath.h"
#include "a11y/gtkcontaineraccessible.h"
#include "a11y/gtkcontaineraccessibleprivate.h"
#include "gtkpopovermenu.h"
/**
* SECTION:gtkcontainer
......@@ -608,7 +609,10 @@ gtk_container_buildable_set_child_property (GtkContainer *container,
GValue gvalue = G_VALUE_INIT;
GError *error = NULL;
if (gtk_widget_get_parent (child) != (GtkWidget *)container && !GTK_IS_ASSISTANT (container) && !GTK_IS_ACTION_BAR (container))
if (gtk_widget_get_parent (child) != (GtkWidget *)container &&
!GTK_IS_ASSISTANT (container) &&
!GTK_IS_ACTION_BAR (container) &&
!GTK_IS_POPOVER_MENU (container))
{
/* This can happen with internal children of complex widgets.
* Silently ignore the child properties in this case. We explicitly
......
/* GTK - The GIMP Toolkit
* Copyright © 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkpopovermenu.h"
#include "gtkstack.h"
#include "gtkbox.h"
#include "gtkintl.h"
struct _GtkPopoverMenu
{
GtkPopover parent_instance;
};
enum {
CHILD_PROP_SUBMENU = 1
};
G_DEFINE_TYPE (GtkPopoverMenu, gtk_popover_menu, GTK_TYPE_POPOVER)
static void
gtk_popover_menu_ensure_stack (GtkPopoverMenu *popover)
{
GtkWidget *stack;
stack = gtk_stack_new ();
gtk_stack_set_vhomogeneous (GTK_STACK (stack), FALSE);
gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT);
gtk_widget_show (stack);
gtk_container_add (GTK_CONTAINER (popover), stack);
}
static GtkWidget *
gtk_popover_menu_ensure_submenu (GtkPopoverMenu *popover,
const gchar *name)
{
GtkWidget *stack;
GtkWidget *submenu;
stack = gtk_bin_get_child (GTK_BIN (popover));
submenu = gtk_stack_get_child_by_name (GTK_STACK (stack), name);
if (submenu == NULL)
{
submenu = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_halign (submenu, GTK_ALIGN_FILL);
g_object_set (submenu, "margin", 10, NULL);
gtk_widget_show (submenu);
gtk_stack_add_named (GTK_STACK (stack), submenu, name);
}
return submenu;
}
static void
gtk_popover_menu_set_submenu (GtkPopoverMenu *popover,
GtkWidget *child,
const gchar *name)
{
const gchar *old_name;
GtkWidget *submenu;
old_name = g_object_get_data (G_OBJECT (child), "GtkPopoverMenu:submenu");
if (g_strcmp0 (old_name, name) == 0)
return;
submenu = gtk_popover_menu_ensure_submenu (popover, name);
g_object_ref (child);
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (child)), child);
gtk_container_add (GTK_CONTAINER (submenu), child);
g_object_unref (child);
g_object_set_data_full (G_OBJECT (child), "GtkPopoverMenu:submenu", g_strdup (name), g_free);
gtk_container_child_notify (GTK_CONTAINER (popover), child, "submenu");
}
static const gchar *
gtk_popover_menu_get_submenu (GtkPopoverMenu *popover,
GtkWidget *child)
{
return (const gchar *)g_object_get_data (G_OBJECT (child), "GtkPopoverMenu:submenu");
}
static void
gtk_popover_menu_add_item (GtkPopoverMenu *popover,
GtkWidget *item)
{
const gchar *name;
GtkWidget *submenu;
name = gtk_popover_menu_get_submenu (popover, item);
if (name == NULL)
name = "main";
submenu = gtk_popover_menu_ensure_submenu (popover, name);
gtk_container_add (GTK_CONTAINER (submenu), item);
}
static void
gtk_popover_menu_remove_item (GtkPopoverMenu *popover,
GtkWidget *item)
{
const gchar *name;
GtkWidget *submenu;
GList *children;
name = gtk_popover_menu_get_submenu (popover, item);
if (name == NULL)
name = "main";
submenu = gtk_popover_menu_ensure_submenu (popover, name);
g_assert (submenu == gtk_widget_get_parent (item));
gtk_container_remove (GTK_CONTAINER (submenu), item);
children = gtk_container_get_children (GTK_CONTAINER (submenu));
if (children == NULL)
gtk_container_remove (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (popover))), submenu);
else
g_list_free (children);
}
static void
gtk_popover_menu_init (GtkPopoverMenu *popover)
{
gtk_popover_menu_ensure_stack (popover);
gtk_popover_menu_ensure_submenu (popover, "main");
}
static void
back_to_main (GtkWidget *popover)
{
GtkWidget *stack;
stack = gtk_bin_get_child (GTK_BIN (popover));
gtk_stack_set_visible_child_name (GTK_STACK (stack), "main");
}
static void
gtk_popover_menu_map (GtkWidget *widget)
{
GTK_WIDGET_CLASS (gtk_popover_menu_parent_class)->map (widget);
back_to_main (widget);
}
static void
gtk_popover_menu_unmap (GtkWidget *widget)
{
back_to_main (widget);
GTK_WIDGET_CLASS (gtk_popover_menu_parent_class)->unmap (widget);
}
static void
gtk_popover_menu_add (GtkContainer *container,
GtkWidget *child)
{
if (!gtk_bin_get_child (GTK_BIN (container)))
{
gtk_widget_set_parent (child, GTK_WIDGET (container));
_gtk_bin_set_child (GTK_BIN (container), child);
}
else
gtk_popover_menu_add_item (GTK_POPOVER_MENU (container), child);
}
static void
gtk_popover_menu_remove (GtkContainer *container,
GtkWidget *child)
{
if (child == gtk_bin_get_child (GTK_BIN (container)))
GTK_CONTAINER_CLASS (gtk_popover_menu_parent_class)->remove (container, child);
else
gtk_popover_menu_remove_item (GTK_POPOVER_MENU (container), child);
}
static void
gtk_popover_menu_get_child_property (GtkContainer *container,
GtkWidget *child,
guint property_id,
GValue *value,
GParamSpec *pspec)
{
if (child == gtk_bin_get_child (GTK_BIN (container)))
return;
switch (property_id)
{
case CHILD_PROP_SUBMENU:
g_value_set_string (value, gtk_popover_menu_get_submenu (GTK_POPOVER_MENU (container), child));
break;
default:
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
break;
}
}
static void
gtk_popover_menu_set_child_property (GtkContainer *container,
GtkWidget *child,
guint property_id,
const GValue *value,
GParamSpec *pspec)
{
if (child == gtk_bin_get_child (GTK_BIN (container)))
return;
switch (property_id)
{
case CHILD_PROP_SUBMENU:
gtk_popover_menu_set_submenu (GTK_POPOVER_MENU (container), child, g_value_get_string (value));
break;
default:
GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
break;
}
}
static void
gtk_popover_menu_class_init (GtkPopoverMenuClass *klass)
{
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
widget_class->map = gtk_popover_menu_map;
widget_class->unmap = gtk_popover_menu_unmap;
container_class->add = gtk_popover_menu_add;
container_class->remove = gtk_popover_menu_remove;
container_class->set_child_property = gtk_popover_menu_set_child_property;
container_class->get_child_property = gtk_popover_menu_get_child_property;
gtk_container_class_install_child_property (container_class,
CHILD_PROP_SUBMENU,
g_param_spec_string ("submenu",
P_("Submenu"),
P_("The name of the submenu to place this child in"),
NULL,
G_PARAM_READWRITE));
}
GtkWidget *
gtk_popover_menu_new (void)
{
return g_object_new (GTK_TYPE_POPOVER_MENU, NULL);
}
/* GTK - The GIMP Toolkit
* Copyright © 2014 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GTK_POPOVER_MENU_H__
#define __GTK_POPOVER_MENU_H__
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gtk/gtkpopover.h>
G_BEGIN_DECLS
#define GTK_TYPE_POPOVER_MENU (gtk_popover_menu_get_type ())
#define GTK_POPOVER_MENU(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_POPOVER_MENU, GtkPopoverMenu))
#define GTK_POPOVER_MENU_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GTK_TYPE_POPOVER_MENU, GtkPopoverMenuClass))
#define GTK_IS_POPOVER_MENU(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_POPOVER_MENU))
#define GTK_IS_POPOVER_MENU_CLASS(o) (G_TYPE_CHECK_CLASS_TYPE ((o), GTK_TYPE_POPOVER_MENU))
#define GTK_POPOVER_MENU_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_POPOVER_MENU, GtkPopoverMenuClass))
typedef struct _GtkPopoverMenu GtkPopoverMenu;
typedef struct _GtkPopoverMenuClass GtkPopoverMenuClass;
struct _GtkPopoverMenuClass
{
GtkPopoverClass parent_class;
/*< private >*/
/* Padding for future expansion */
gpointer reserved[10];
};
GDK_AVAILABLE_IN_3_16
GType gtk_popover_menu_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_3_16
GtkWidget * gtk_popover_menu_new (void);
G_END_DECLS
#endif /* __GTK_POPOVER_MENU_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment