/* GTK - The GIMP Toolkit
* gtkrecentchooserdefault.c
* Copyright (C) 2005-2006, Emmanuele Bassi
- *
+ *
* 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
* 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <unistd.h>
#endif
-#include <gdk/gdkscreen.h>
-
#include "gtkstock.h"
#include "gtkicontheme.h"
#include "gtkiconfactory.h"
#include "gtkcellrenderertext.h"
#include "gtkcheckmenuitem.h"
#include "gtkclipboard.h"
-#include "gtkcombobox.h"
+#include "gtkcomboboxtext.h"
#include "gtkentry.h"
#include "gtkeventbox.h"
#include "gtkexpander.h"
#include "gtkframe.h"
-#include "gtkhbox.h"
-#include "gtkhpaned.h"
+#include "gtkbox.h"
+#include "gtkpaned.h"
#include "gtkimage.h"
#include "gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtkscrolledwindow.h"
#include "gtkseparatormenuitem.h"
#include "gtksizegroup.h"
-#include "gtktable.h"
+#include "gtksizerequest.h"
#include "gtktreemodelsort.h"
#include "gtktreemodelfilter.h"
#include "gtktreeselection.h"
#include "gtktreestore.h"
-#include "gtktooltips.h"
+#include "gtktooltip.h"
#include "gtktypebuiltins.h"
-#include "gtkvbox.h"
+#include "gtkorientable.h"
+#include "gtkactivatable.h"
#include "gtkrecentmanager.h"
#include "gtkrecentfilter.h"
#include "gtkrecentchooserutils.h"
#include "gtkrecentchooserdefault.h"
-#include "gtkprivate.h"
-#include "gtkalias.h"
-\f
+enum
+{
+ PROP_0,
+
+ /* activatable properties */
+ PROP_ACTIVATABLE_RELATED_ACTION,
+ PROP_ACTIVATABLE_USE_ACTION_APPEARANCE
+};
+
struct _GtkRecentChooserDefault
{
- GtkVBox parent_instance;
-
+ GtkBox parent_instance;
+
GtkRecentManager *manager;
gulong manager_changed_id;
guint local_manager : 1;
-
+
gint icon_size;
/* RecentChooser properties */
- gint limit;
+ gint limit;
GtkRecentSortType sort_type;
guint show_private : 1;
guint show_not_found : 1;
guint show_tips : 1;
guint show_icons : 1;
guint local_only : 1;
+
+ guint limit_set : 1;
GSList *filters;
GtkRecentFilter *current_filter;
gpointer sort_data;
GDestroyNotify sort_data_destroy;
- GtkTooltips *tooltips;
-
GtkIconTheme *icon_theme;
GtkWidget *recent_view;
typedef struct _GtkRecentChooserDefaultClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
} GtkRecentChooserDefaultClass;
enum {
RECENT_URI_COLUMN,
RECENT_DISPLAY_NAME_COLUMN,
RECENT_INFO_COLUMN,
-
N_RECENT_COLUMNS
};
LOAD_FINISHED /* the model is fully loaded and inserted */
};
-enum {
- TEXT_URI_LIST
-};
-
-/* Target types for DnD from the file list */
-static const GtkTargetEntry recent_list_source_targets[] = {
- { "text/uri-list", 0, TEXT_URI_LIST }
-};
-
/* Icon size for if we can't get it from the theme */
#define FALLBACK_ICON_SIZE 48
#define FALLBACK_ITEM_LIMIT 20
static GtkIconTheme *get_icon_theme_for_widget (GtkWidget *widget);
static gint get_icon_size_for_widget (GtkWidget *widget,
GtkIconSize icon_size);
+static gint get_recent_files_limit (GtkWidget *widget);
static void reload_recent_items (GtkRecentChooserDefault *impl);
static void chooser_set_model (GtkRecentChooserDefault *impl);
guint info,
guint32 time_,
gpointer data);
+static gboolean recent_view_query_tooltip_cb (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip,
+ gpointer user_data);
+
+static void gtk_recent_chooser_activatable_iface_init (GtkActivatableIface *iface);
+static void gtk_recent_chooser_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name);
+static void gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action);
G_DEFINE_TYPE_WITH_CODE (GtkRecentChooserDefault,
_gtk_recent_chooser_default,
- GTK_TYPE_VBOX,
+ GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GTK_TYPE_RECENT_CHOOSER,
- gtk_recent_chooser_iface_init))
+ gtk_recent_chooser_iface_init)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
+ gtk_recent_chooser_activatable_iface_init))
\f
iface->list_filters = gtk_recent_chooser_default_list_filters;
}
+static void
+gtk_recent_chooser_activatable_iface_init (GtkActivatableIface *iface)
+
+{
+ iface->update = gtk_recent_chooser_update;
+ iface->sync_action_properties = gtk_recent_chooser_sync_action_properties;
+}
+
static void
_gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass)
{
widget_class->show_all = gtk_recent_chooser_default_show_all;
_gtk_recent_chooser_install_properties (gobject_class);
+
+ g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_RELATED_ACTION, "related-action");
+ g_object_class_override_property (gobject_class, PROP_ACTIVATABLE_USE_ACTION_APPEARANCE, "use-action-appearance");
}
static void
{
gtk_box_set_spacing (GTK_BOX (impl), 6);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (impl),
+ GTK_ORIENTATION_VERTICAL);
+
/* by default, we use the global manager */
impl->local_manager = FALSE;
-
+
impl->limit = FALLBACK_ITEM_LIMIT;
impl->sort_type = GTK_RECENT_SORT_NONE;
impl->show_icons = TRUE;
impl->show_private = FALSE;
impl->show_not_found = TRUE;
- impl->show_tips = TRUE;
+ impl->show_tips = FALSE;
impl->select_multiple = FALSE;
impl->local_only = TRUE;
impl->current_filter = NULL;
- impl->tooltips = gtk_tooltips_new ();
- g_object_ref_sink (impl->tooltips);
-
impl->recent_items = NULL;
impl->n_recent_items = 0;
impl->loaded_items = 0;
g_assert (impl->manager);
gtk_widget_push_composite_child ();
+
+ impl->limit = get_recent_files_limit (GTK_WIDGET (impl));
scrollw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollw),
G_CALLBACK (recent_view_popup_menu_cb), impl);
g_signal_connect (impl->recent_view, "button-press-event",
G_CALLBACK (recent_view_button_press_cb), impl);
- g_signal_connect (impl->recent_view, "drag_begin",
+ g_signal_connect (impl->recent_view, "drag-begin",
G_CALLBACK (recent_view_drag_begin_cb), impl);
- g_signal_connect (impl->recent_view, "drag_data_get",
+ g_signal_connect (impl->recent_view, "drag-data-get",
G_CALLBACK (recent_view_drag_data_get_cb), impl);
+ g_object_set (impl->recent_view, "has-tooltip", TRUE, NULL);
+ g_signal_connect (impl->recent_view, "query-tooltip",
+ G_CALLBACK (recent_view_query_tooltip_cb), impl);
+
g_object_set_data (G_OBJECT (impl->recent_view),
"GtkRecentChooserDefault", impl);
gtk_tree_view_column_set_resizable (impl->icon_column, FALSE);
renderer = gtk_cell_renderer_pixbuf_new ();
+ g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL);
gtk_tree_view_column_pack_start (impl->icon_column, renderer, FALSE);
gtk_tree_view_column_set_cell_data_func (impl->icon_column,
renderer,
/* drag and drop */
gtk_drag_source_set (impl->recent_view,
GDK_BUTTON1_MASK,
- recent_list_source_targets,
- G_N_ELEMENTS (recent_list_source_targets),
+ NULL, 0,
GDK_ACTION_COPY);
+ gtk_drag_source_add_uri_targets (impl->recent_view);
- impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
-
- impl->filter_combo = gtk_combo_box_new_text ();
+ impl->filter_combo_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+
+ impl->filter_combo = gtk_combo_box_text_new ();
gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
g_signal_connect (impl->filter_combo, "changed",
G_CALLBACK (filter_combo_changed_cb), impl);
- gtk_tooltips_set_tip (impl->tooltips,
- impl->filter_combo,
- _("Select which type of documents are shown"),
- NULL);
+ gtk_widget_set_tooltip_text (impl->filter_combo,
+ _("Select which type of documents are shown"));
gtk_box_pack_end (GTK_BOX (impl->filter_combo_hbox),
impl->filter_combo,
break;
case GTK_RECENT_CHOOSER_PROP_SHOW_TIPS:
impl->show_tips = g_value_get_boolean (value);
-
- if (impl->show_tips)
- gtk_tooltips_enable (impl->tooltips);
- else
- gtk_tooltips_disable (impl->tooltips);
break;
case GTK_RECENT_CHOOSER_PROP_SHOW_ICONS:
impl->show_icons = g_value_get_boolean (value);
break;
case GTK_RECENT_CHOOSER_PROP_LIMIT:
impl->limit = g_value_get_int (value);
+ impl->limit_set = TRUE;
reload_recent_items (impl);
break;
case GTK_RECENT_CHOOSER_PROP_SORT_TYPE:
case GTK_RECENT_CHOOSER_PROP_FILTER:
set_current_filter (impl, g_value_get_object (value));
break;
+ case PROP_ACTIVATABLE_RELATED_ACTION:
+ _gtk_recent_chooser_set_related_action (GTK_RECENT_CHOOSER (impl), g_value_get_object (value));
+ break;
+ case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE:
+ _gtk_recent_chooser_set_use_action_appearance (GTK_RECENT_CHOOSER (impl), g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
case GTK_RECENT_CHOOSER_PROP_FILTER:
g_value_set_object (value, impl->current_filter);
break;
+ case PROP_ACTIVATABLE_RELATED_ACTION:
+ g_value_set_object (value, _gtk_recent_chooser_get_related_action (GTK_RECENT_CHOOSER (impl)));
+ break;
+ case PROP_ACTIVATABLE_USE_ACTION_APPEARANCE:
+ g_value_set_boolean (value, _gtk_recent_chooser_get_use_action_appearance (GTK_RECENT_CHOOSER (impl)));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
impl->load_id = 0;
}
- if (impl->recent_items)
- {
- g_list_foreach (impl->recent_items, (GFunc) gtk_recent_info_unref, NULL);
- g_list_free (impl->recent_items);
- impl->recent_items = NULL;
- }
+ g_list_free_full (impl->recent_items, (GDestroyNotify) gtk_recent_info_unref);
+ impl->recent_items = NULL;
if (impl->manager && impl->manager_changed_id)
{
impl->recent_store = NULL;
}
- if (impl->tooltips)
- {
- g_object_unref (impl->tooltips);
- impl->tooltips = NULL;
- }
-
G_OBJECT_CLASS (_gtk_recent_chooser_default_parent_class)->dispose (object);
}
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
"%s", detail);
- if (parent->group)
- gtk_window_group_add_window (parent->group, GTK_WINDOW (dialog));
+ if (gtk_window_has_group (parent))
+ gtk_window_group_add_window (gtk_window_get_group (parent),
+ GTK_WINDOW (dialog));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (widget);
- if (!GTK_WIDGET_TOPLEVEL (toplevel))
+ if (!gtk_widget_is_toplevel (toplevel))
return NULL;
else
return GTK_WINDOW (toplevel);
GdkCursor *cursor;
toplevel = get_toplevel (GTK_WIDGET (impl));
- if (!toplevel || !GTK_WIDGET_REALIZED (toplevel))
+ if (!toplevel || !gtk_widget_get_realized (GTK_WIDGET (toplevel)))
return;
display = gtk_widget_get_display (GTK_WIDGET (toplevel));
if (show_busy_cursor)
cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
- gdk_window_set_cursor (GTK_WIDGET (toplevel)->window, cursor);
+ gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (toplevel)),
+ cursor);
gdk_display_flush (display);
if (cursor)
- gdk_cursor_unref (cursor);
+ g_object_unref (cursor);
}
static void
/* we have finished loading, so we remove the items cache */
impl->load_state = LOAD_LOADING;
- g_list_foreach (impl->recent_items,
- (GFunc) gtk_recent_info_unref,
- NULL);
- g_list_free (impl->recent_items);
+ g_list_free_full (impl->recent_items, (GDestroyNotify) gtk_recent_info_unref);
impl->recent_items = NULL;
impl->n_recent_items = 0;
static void
reload_recent_items (GtkRecentChooserDefault *impl)
{
+ GtkWidget *widget;
+
/* reload is already in progress - do not disturb */
if (impl->load_id)
return;
+ widget = GTK_WIDGET (impl);
+
gtk_tree_view_set_model (GTK_TREE_VIEW (impl->recent_view), NULL);
gtk_list_store_clear (impl->recent_store);
if (!impl->icon_theme)
- impl->icon_theme = get_icon_theme_for_widget (GTK_WIDGET (impl));
+ impl->icon_theme = get_icon_theme_for_widget (widget);
- impl->icon_size = get_icon_size_for_widget (GTK_WIDGET (impl),
+ impl->icon_size = get_icon_size_for_widget (widget,
GTK_ICON_SIZE_BUTTON);
+ if (!impl->limit_set)
+ impl->limit = get_recent_files_limit (widget);
+
set_busy_cursor (impl, TRUE);
impl->load_state = LOAD_EMPTY;
static void
set_default_size (GtkRecentChooserDefault *impl)
{
+ GtkScrolledWindow *scrollw;
GtkWidget *widget;
gint width, height;
- gint font_size;
+ double font_size;
GdkScreen *screen;
gint monitor_num;
GtkRequisition req;
GdkRectangle monitor;
+ GtkStyleContext *context;
+ GtkStateFlags state;
widget = GTK_WIDGET (impl);
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
/* Size based on characters and the icon size */
- font_size = pango_font_description_get_size (widget->style->font_desc);
- font_size = PANGO_PIXELS (font_size);
+ gtk_style_context_get (context, state, "font-size", &font_size, NULL);
- width = impl->icon_size + font_size * NUM_CHARS;
- height = (impl->icon_size + font_size) * NUM_LINES;
+ width = impl->icon_size + font_size * NUM_CHARS + 0.5;
+ height = (impl->icon_size + font_size) * NUM_LINES + 0.5;
/* Use at least the requisition size... */
- gtk_widget_size_request (widget, &req);
+ gtk_widget_get_preferred_size (widget, &req, NULL);
width = MAX (width, req.width);
height = MAX (height, req.height);
/* ... but no larger than the monitor */
screen = gtk_widget_get_screen (widget);
- monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+ monitor_num = gdk_screen_get_monitor_at_window (screen,
+ gtk_widget_get_window (widget));
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+ gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
width = MIN (width, monitor.width * 3 / 4);
height = MIN (height, monitor.height * 3 / 4);
/* Set size */
- gtk_widget_set_size_request (impl->recent_view, width, height);
+ scrollw = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (impl->recent_view));
+ gtk_scrolled_window_set_min_content_width (scrollw, width);
+ gtk_scrolled_window_set_min_content_height (scrollw, height);
}
static void
gtk_recent_chooser_default_map (GtkWidget *widget)
{
GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (widget);
-
- if (GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map)
- GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
+
+ GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
/* reloads everything */
reload_recent_items (impl);
GtkTreeIter *iter,
gpointer user_data)
{
- GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (user_data);
GtkRecentInfo *info = NULL;
- GdkPixbuf *pixbuf;
-
- gtk_tree_model_get (model, iter,
- RECENT_INFO_COLUMN, &info,
- -1);
+ GIcon *icon;
+
+ gtk_tree_model_get (model, iter, RECENT_INFO_COLUMN, &info, -1);
g_assert (info != NULL);
-
- pixbuf = gtk_recent_info_get_icon (info, impl->icon_size);
-
- g_object_set (cell,
- "pixbuf", pixbuf,
- NULL);
-
- if (pixbuf)
- g_object_unref (pixbuf);
+
+ icon = gtk_recent_info_get_gicon (info);
+ g_object_set (cell, "gicon", icon, NULL);
+
+ if (icon != NULL)
+ g_object_unref (icon);
+
+ gtk_recent_info_unref (info);
}
static void
gpointer user_data)
{
GtkRecentInfo *info = NULL;
- gchar *uri, *name, *str;
- gchar *escaped_name, *escaped_location;
+ gchar *name;
gtk_tree_model_get (model, iter,
RECENT_DISPLAY_NAME_COLUMN, &name,
-1);
g_assert (info != NULL);
- uri = gtk_recent_info_get_uri_display (info);
-
if (!name)
name = gtk_recent_info_get_short_name (info);
- escaped_name = g_markup_printf_escaped ("<b>%s</b>", name);
- escaped_location = g_markup_printf_escaped ("<small>%s: %s</small>",
- _("Location"),
- uri);
- str = g_strjoin ("\n", escaped_name, escaped_location, NULL);
- g_free (escaped_name);
- g_free (escaped_location);
-
- g_object_set (cell, "markup", str, NULL);
+ g_object_set (cell, "text", name, NULL);
- g_free (str);
- g_free (uri);
g_free (name);
gtk_recent_info_unref (info);
}
/* display new filter */
name = gtk_recent_filter_get_name (filter);
if (!name)
- name = "Untitled filter";
-
- gtk_combo_box_append_text (GTK_COMBO_BOX (impl->filter_combo), name);
-
+ name = _("Untitled filter");
+
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (impl->filter_combo), name);
+
if (!g_slist_find (impl->filters, impl->current_filter))
set_current_filter (impl, filter);
return FALLBACK_ICON_SIZE;
}
+static gint
+get_recent_files_limit (GtkWidget *widget)
+{
+ GtkSettings *settings;
+ gint limit;
+
+ if (gtk_widget_has_screen (widget))
+ settings = gtk_settings_get_for_screen (gtk_widget_get_screen (widget));
+ else
+ settings = gtk_settings_get_default ();
+
+ g_object_get (G_OBJECT (settings), "gtk-recent-files-limit", &limit, NULL);
+
+ return limit;
+}
static void
recent_manager_changed_cb (GtkRecentManager *manager,
gpointer data)
{
GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (data);
- DragData *drag_data;
+ DragData drag_data;
gsize n_uris;
n_uris = gtk_tree_selection_count_selected_rows (impl->selection);
if (n_uris == 0)
- return;
+ return;
- drag_data = g_new (DragData, 1);
- drag_data->uri_list = g_new0 (gchar *, n_uris + 1);
- drag_data->next_pos = 0;
+ drag_data.uri_list = g_new0 (gchar *, n_uris + 1);
+ drag_data.next_pos = 0;
gtk_tree_selection_selected_foreach (impl->selection,
append_uri_to_urilist,
- drag_data);
+ &drag_data);
- gtk_selection_data_set_uris (selection_data, drag_data->uri_list);
+ gtk_selection_data_set_uris (selection_data, drag_data.uri_list);
- g_strfreev (drag_data->uri_list);
- g_free (drag_data);
+ g_strfreev (drag_data.uri_list);
}
+static gboolean
+recent_view_query_tooltip_cb (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip,
+ gpointer user_data)
+{
+ GtkRecentChooserDefault *impl = user_data;
+ GtkTreeView *tree_view;
+ GtkTreeIter iter;
+ GtkTreePath *path = NULL;
+ GtkRecentInfo *info = NULL;
+ gchar *uri_display;
+
+ if (!impl->show_tips)
+ return FALSE;
+
+ tree_view = GTK_TREE_VIEW (impl->recent_view);
+
+ gtk_tree_view_get_tooltip_context (tree_view,
+ &x, &y,
+ keyboard_tip,
+ NULL, &path, NULL);
+ if (!path)
+ return FALSE;
+
+ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->recent_store), &iter, path))
+ {
+ gtk_tree_path_free (path);
+ return FALSE;
+ }
+
+ gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_store), &iter,
+ RECENT_INFO_COLUMN, &info,
+ -1);
+
+ uri_display = gtk_recent_info_get_uri_display (info);
+
+ gtk_tooltip_set_text (tooltip, uri_display);
+ gtk_tree_view_set_tooltip_row (tree_view, tooltip, path);
+
+ g_free (uri_display);
+ gtk_tree_path_free (path);
+ gtk_recent_info_unref (info);
+ return TRUE;
+}
static void
remove_selected_from_list (GtkRecentChooserDefault *impl)
{
gchar *msg;
- msg = strdup (_("Could not remove item"));
+ msg = g_strdup (_("Could not remove item"));
error_message (impl, msg, err->message);
g_free (msg);
GDK_SELECTION_CLIPBOARD),
utf8_uri, -1);
+ gtk_recent_info_unref (info);
g_free (utf8_uri);
}
gboolean *push_in,
gpointer user_data)
{
+ GtkAllocation allocation;
GtkWidget *widget = GTK_WIDGET (user_data);
GdkScreen *screen = gtk_widget_get_screen (widget);
GtkRequisition req;
gint monitor_num;
GdkRectangle monitor;
- if (G_UNLIKELY (!GTK_WIDGET_REALIZED (widget)))
+ if (G_UNLIKELY (!gtk_widget_get_realized (widget)))
return;
- gdk_window_get_origin (widget->window, x, y);
+ gdk_window_get_origin (gtk_widget_get_window (widget),
+ x, y);
- gtk_widget_size_request (GTK_WIDGET (menu), &req);
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu),
+ &req, NULL);
- *x += (widget->allocation.width - req.width) / 2;
- *y += (widget->allocation.height - req.height) / 2;
+ gtk_widget_get_allocation (widget, &allocation);
+ *x += (allocation.width - req.width) / 2;
+ *y += (allocation.height - req.height) / 2;
monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
gtk_menu_set_monitor (menu, monitor_num);
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+ gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
*x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
*y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
gpointer user_data)
{
GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (user_data);
-
- if (event->button == 3)
+
+ if (gdk_event_triggers_context_menu ((GdkEvent *) event))
{
GtkTreePath *path;
gboolean res;
}
}
+static void
+gtk_recent_chooser_update (GtkActivatable *activatable,
+ GtkAction *action,
+ const gchar *property_name)
+{
+ if (strcmp (property_name, "visible") == 0)
+ {
+ if (gtk_action_is_visible (action))
+ gtk_widget_show (GTK_WIDGET (activatable));
+ else
+ gtk_widget_hide (GTK_WIDGET (activatable));
+ }
+
+ if (strcmp (property_name, "sensitive") == 0)
+ gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+
+ _gtk_recent_chooser_update (activatable, action, property_name);
+}
+
+
+static void
+gtk_recent_chooser_sync_action_properties (GtkActivatable *activatable,
+ GtkAction *action)
+{
+ if (action)
+ {
+ if (gtk_action_is_visible (action))
+ gtk_widget_show (GTK_WIDGET (activatable));
+ else
+ gtk_widget_hide (GTK_WIDGET (activatable));
+
+ gtk_widget_set_sensitive (GTK_WIDGET (activatable), gtk_action_is_sensitive (action));
+ }
+
+ _gtk_recent_chooser_sync_action_properties (activatable, action);
+}
+
+
GtkWidget *
_gtk_recent_chooser_default_new (GtkRecentManager *manager)
{
projects / ~andy / gtk / blobdiff