X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkpathbar.c;h=03ac4c9479728bde5d6c8751115fdfdf16fce991;hb=HEAD;hp=059425130523d69522072164af6d32eba293f342;hpb=13277493eb99fc0e5d99acd719ab54a2cd83dadb;p=~andy%2Fgtk
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 059425130..03ac4c947 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -13,27 +13,30 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library 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 .
*/
-#include
-#include
+#include "config.h"
+
#include "gtkpathbar.h"
-#include "gtktogglebutton.h"
-#include "gtkalignment.h"
+
+#include
+
#include "gtkarrow.h"
+#include "gtkbox.h"
#include "gtkdnd.h"
+#include "gtkiconfactory.h"
+#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkintl.h"
-#include "gtkicontheme.h"
-#include "gtkiconfactory.h"
#include "gtklabel.h"
-#include "gtkhbox.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkalias.h"
+#include "gtksettings.h"
+#include "gtktogglebutton.h"
+#include "gtkwidgetpath.h"
+#include "gtkwidgetprivate.h"
+
enum {
PATH_CLICKED,
@@ -63,10 +66,10 @@ struct _ButtonData
GtkWidget *button;
ButtonType type;
char *dir_name;
- GtkFilePath *path;
+ GFile *file;
GtkWidget *image;
GtkWidget *label;
- GtkFileSystemHandle *handle;
+ GCancellable *cancellable;
guint ignore_changes : 1;
guint file_is_hidden : 1;
};
@@ -80,9 +83,16 @@ G_DEFINE_TYPE (GtkPathBar, gtk_path_bar, GTK_TYPE_CONTAINER)
static void gtk_path_bar_finalize (GObject *object);
static void gtk_path_bar_dispose (GObject *object);
-static void gtk_path_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_path_bar_unmap (GtkWidget *widget);
+static void gtk_path_bar_realize (GtkWidget *widget);
+static void gtk_path_bar_unrealize (GtkWidget *widget);
+static void gtk_path_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_path_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_path_bar_map (GtkWidget *widget);
+static void gtk_path_bar_unmap (GtkWidget *widget);
static void gtk_path_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_path_bar_add (GtkContainer *container,
@@ -93,10 +103,12 @@ static void gtk_path_bar_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
-static void gtk_path_bar_scroll_up (GtkWidget *button,
- GtkPathBar *path_bar);
-static void gtk_path_bar_scroll_down (GtkWidget *button,
- GtkPathBar *path_bar);
+static GtkWidgetPath *gtk_path_bar_get_path_for_child (GtkContainer *container,
+ GtkWidget *child);
+static gboolean gtk_path_bar_scroll (GtkWidget *widget,
+ GdkEventScroll *event);
+static void gtk_path_bar_scroll_up (GtkPathBar *path_bar);
+static void gtk_path_bar_scroll_down (GtkPathBar *path_bar);
static void gtk_path_bar_stop_scrolling (GtkPathBar *path_bar);
static gboolean gtk_path_bar_slider_up_defocus (GtkWidget *widget,
GdkEventButton *event,
@@ -114,8 +126,7 @@ static void gtk_path_bar_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
static void gtk_path_bar_state_changed (GtkWidget *widget,
GtkStateType previous_state);
-static void gtk_path_bar_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+static void gtk_path_bar_style_updated (GtkWidget *widget);
static void gtk_path_bar_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen);
static void gtk_path_bar_check_icon_theme (GtkPathBar *path_bar);
@@ -150,7 +161,9 @@ get_slider_button (GtkPathBar *path_bar,
atk_object_set_name (atk_obj, _("Down Path"));
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
- gtk_container_add (GTK_CONTAINER (button), gtk_arrow_new (arrow_type, GTK_SHADOW_OUT));
+ gtk_widget_add_events (button, GDK_SCROLL_MASK);
+ gtk_container_add (GTK_CONTAINER (button),
+ gtk_arrow_new (arrow_type, GTK_SHADOW_OUT));
gtk_container_add (GTK_CONTAINER (path_bar), button);
gtk_widget_show_all (button);
@@ -165,61 +178,79 @@ get_slider_button (GtkPathBar *path_bar,
static void
gtk_path_bar_init (GtkPathBar *path_bar)
{
- GTK_WIDGET_SET_FLAGS (path_bar, GTK_NO_WINDOW);
+ GtkStyleContext *context;
+
+ gtk_widget_set_has_window (GTK_WIDGET (path_bar), FALSE);
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (path_bar), FALSE);
- path_bar->set_path_handle = NULL;
+ path_bar->get_info_cancellable = NULL;
path_bar->spacing = 0;
path_bar->up_slider_button = get_slider_button (path_bar, GTK_ARROW_LEFT);
path_bar->down_slider_button = get_slider_button (path_bar, GTK_ARROW_RIGHT);
path_bar->icon_size = FALLBACK_ICON_SIZE;
- g_signal_connect (path_bar->up_slider_button, "clicked", G_CALLBACK (gtk_path_bar_scroll_up), path_bar);
- g_signal_connect (path_bar->down_slider_button, "clicked", G_CALLBACK (gtk_path_bar_scroll_down), path_bar);
-
- g_signal_connect (path_bar->up_slider_button, "focus_out_event", G_CALLBACK (gtk_path_bar_slider_up_defocus), path_bar);
- g_signal_connect (path_bar->down_slider_button, "focus_out_event", G_CALLBACK (gtk_path_bar_slider_down_defocus), path_bar);
-
- g_signal_connect (path_bar->up_slider_button, "button_press_event", G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
- g_signal_connect (path_bar->up_slider_button, "button_release_event", G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
- g_signal_connect (path_bar->down_slider_button, "button_press_event", G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
- g_signal_connect (path_bar->down_slider_button, "button_release_event", G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
+ g_signal_connect_swapped (path_bar->up_slider_button, "clicked",
+ G_CALLBACK (gtk_path_bar_scroll_up), path_bar);
+ g_signal_connect_swapped (path_bar->down_slider_button, "clicked",
+ G_CALLBACK (gtk_path_bar_scroll_down), path_bar);
+
+ g_signal_connect (path_bar->up_slider_button, "focus-out-event",
+ G_CALLBACK (gtk_path_bar_slider_up_defocus), path_bar);
+ g_signal_connect (path_bar->down_slider_button, "focus-out-event",
+ G_CALLBACK (gtk_path_bar_slider_down_defocus), path_bar);
+
+ g_signal_connect (path_bar->up_slider_button, "button-press-event",
+ G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
+ g_signal_connect (path_bar->up_slider_button, "button-release-event",
+ G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
+ g_signal_connect (path_bar->down_slider_button, "button-press-event",
+ G_CALLBACK (gtk_path_bar_slider_button_press), path_bar);
+ g_signal_connect (path_bar->down_slider_button, "button-release-event",
+ G_CALLBACK (gtk_path_bar_slider_button_release), path_bar);
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (path_bar));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
}
static void
gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
{
GObjectClass *gobject_class;
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
gobject_class = (GObjectClass *) path_bar_class;
- object_class = (GtkObjectClass *) path_bar_class;
widget_class = (GtkWidgetClass *) path_bar_class;
container_class = (GtkContainerClass *) path_bar_class;
gobject_class->finalize = gtk_path_bar_finalize;
gobject_class->dispose = gtk_path_bar_dispose;
- widget_class->size_request = gtk_path_bar_size_request;
+ widget_class->get_preferred_width = gtk_path_bar_get_preferred_width;
+ widget_class->get_preferred_height = gtk_path_bar_get_preferred_height;
+ widget_class->realize = gtk_path_bar_realize;
+ widget_class->unrealize = gtk_path_bar_unrealize;
+ widget_class->map = gtk_path_bar_map;
widget_class->unmap = gtk_path_bar_unmap;
widget_class->size_allocate = gtk_path_bar_size_allocate;
- widget_class->style_set = gtk_path_bar_style_set;
+ widget_class->style_updated = gtk_path_bar_style_updated;
widget_class->screen_changed = gtk_path_bar_screen_changed;
widget_class->grab_notify = gtk_path_bar_grab_notify;
widget_class->state_changed = gtk_path_bar_state_changed;
+ widget_class->scroll_event = gtk_path_bar_scroll;
container_class->add = gtk_path_bar_add;
container_class->forall = gtk_path_bar_forall;
container_class->remove = gtk_path_bar_remove;
+ container_class->get_path_for_child = gtk_path_bar_get_path_for_child;
+ gtk_container_class_handle_border_width (container_class);
/* FIXME: */
/* container_class->child_type = gtk_path_bar_child_type;*/
path_bar_signals [PATH_CLICKED] =
g_signal_new (I_("path-clicked"),
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkPathBarClass, path_clicked),
NULL, NULL,
@@ -241,12 +272,12 @@ gtk_path_bar_finalize (GObject *object)
gtk_path_bar_stop_scrolling (path_bar);
g_list_free (path_bar->button_list);
- if (path_bar->root_path)
- gtk_file_path_free (path_bar->root_path);
- if (path_bar->home_path)
- gtk_file_path_free (path_bar->home_path);
- if (path_bar->desktop_path)
- gtk_file_path_free (path_bar->desktop_path);
+ if (path_bar->root_file)
+ g_object_unref (path_bar->root_file);
+ if (path_bar->home_file)
+ g_object_unref (path_bar->home_file);
+ if (path_bar->desktop_file)
+ g_object_unref (path_bar->desktop_file);
if (path_bar->root_icon)
g_object_unref (path_bar->root_icon);
@@ -284,9 +315,9 @@ gtk_path_bar_dispose (GObject *object)
remove_settings_signal (path_bar, gtk_widget_get_screen (GTK_WIDGET (object)));
- if (path_bar->set_path_handle)
- gtk_file_system_cancel_operation (path_bar->set_path_handle);
- path_bar->set_path_handle = NULL;
+ if (path_bar->get_info_cancellable)
+ g_cancellable_cancel (path_bar->get_info_cancellable);
+ path_bar->get_info_cancellable = NULL;
G_OBJECT_CLASS (gtk_path_bar_parent_class)->dispose (object);
}
@@ -297,42 +328,74 @@ gtk_path_bar_dispose (GObject *object)
* available space.
*/
static void
-gtk_path_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+gtk_path_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
ButtonData *button_data;
GtkPathBar *path_bar;
- GtkRequisition child_requisition;
GList *list;
+ gint child_height;
+ gint height;
+ gint child_min, child_nat;
path_bar = GTK_PATH_BAR (widget);
- requisition->width = 0;
- requisition->height = 0;
+ *minimum = *natural = 0;
+ height = 0;
for (list = path_bar->button_list; list; list = list->next)
{
button_data = BUTTON_DATA (list->data);
- gtk_widget_size_request (button_data->button, &child_requisition);
- requisition->width = MAX (child_requisition.width, requisition->width);
- requisition->height = MAX (child_requisition.height, requisition->height);
+ gtk_widget_get_preferred_width (button_data->button, &child_min, &child_nat);
+ gtk_widget_get_preferred_height (button_data->button, &child_height, NULL);
+ height = MAX (height, child_height);
+
+ if (button_data->type == NORMAL_BUTTON)
+ {
+ /* Use 2*Height as button width because of ellipsized label. */
+ child_min = MAX (child_min, child_height * 2);
+ child_nat = MAX (child_min, child_height * 2);
+ }
+
+ *minimum = MAX (*minimum, child_min);
+ *natural = MAX (*natural, child_nat);
}
/* Add space for slider, if we have more than one path */
/* Theoretically, the slider could be bigger than the other button. But we're
* not going to worry about that now.
*/
- path_bar->slider_width = MIN(requisition->height * 2 / 3 + 5, requisition->height);
+ path_bar->slider_width = MIN (height * 2 / 3 + 5, height);
if (path_bar->button_list && path_bar->button_list->next != NULL)
- requisition->width += (path_bar->spacing + path_bar->slider_width) * 2;
+ {
+ *minimum += (path_bar->spacing + path_bar->slider_width) * 2;
+ *natural += (path_bar->spacing + path_bar->slider_width) * 2;
+ }
+}
- gtk_widget_size_request (path_bar->up_slider_button, &child_requisition);
- gtk_widget_size_request (path_bar->down_slider_button, &child_requisition);
+static void
+gtk_path_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ ButtonData *button_data;
+ GtkPathBar *path_bar;
+ GList *list;
+ gint child_min, child_nat;
- requisition->width += GTK_CONTAINER (widget)->border_width * 2;
- requisition->height += GTK_CONTAINER (widget)->border_width * 2;
+ path_bar = GTK_PATH_BAR (widget);
+
+ *minimum = *natural = 0;
- widget->requisition = *requisition;
+ for (list = path_bar->button_list; list; list = list->next)
+ {
+ button_data = BUTTON_DATA (list->data);
+ gtk_widget_get_preferred_height (button_data->button, &child_min, &child_nat);
+
+ *minimum = MAX (*minimum, child_min);
+ *natural = MAX (*natural, child_nat);
+ }
}
static void
@@ -362,14 +425,91 @@ gtk_path_bar_update_slider_buttons (GtkPathBar *path_bar)
}
}
+static void
+gtk_path_bar_map (GtkWidget *widget)
+{
+ gdk_window_show (GTK_PATH_BAR (widget)->event_window);
+
+ GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->map (widget);
+}
+
static void
gtk_path_bar_unmap (GtkWidget *widget)
{
gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
+ gdk_window_hide (GTK_PATH_BAR (widget)->event_window);
GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unmap (widget);
}
+static void
+gtk_path_bar_realize (GtkWidget *widget)
+{
+ GtkPathBar *path_bar;
+ GtkAllocation allocation;
+ GdkWindow *window;
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+
+ gtk_widget_set_realized (widget, TRUE);
+
+ path_bar = GTK_PATH_BAR (widget);
+ window = gtk_widget_get_parent_window (widget);
+ gtk_widget_set_window (widget, window);
+ g_object_ref (window);
+
+ gtk_widget_get_allocation (widget, &allocation);
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.x = allocation.x;
+ attributes.y = allocation.y;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
+ attributes.wclass = GDK_INPUT_ONLY;
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= GDK_SCROLL_MASK;
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+ path_bar->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gtk_widget_register_window (widget, path_bar->event_window);
+}
+
+static void
+gtk_path_bar_unrealize (GtkWidget *widget)
+{
+ GtkPathBar *path_bar;
+
+ path_bar = GTK_PATH_BAR (widget);
+
+ gtk_widget_unregister_window (widget, path_bar->event_window);
+ gdk_window_destroy (path_bar->event_window);
+ path_bar->event_window = NULL;
+
+ GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->unrealize (widget);
+}
+
+static void
+child_ordering_changed (GtkPathBar *path_bar)
+{
+ GList *l;
+
+ if (path_bar->up_slider_button)
+ _gtk_widget_invalidate_style_context (path_bar->up_slider_button,
+ GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
+ if (path_bar->down_slider_button)
+ _gtk_widget_invalidate_style_context (path_bar->down_slider_button,
+ GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
+
+ for (l = path_bar->button_list; l; l = l->next)
+ {
+ ButtonData *data = l->data;
+
+ _gtk_widget_invalidate_style_context (data->button,
+ GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
+ }
+}
+
/* This is a tad complicated
*/
static void
@@ -383,32 +523,38 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
GList *list, *first_button;
gint width;
gint allocation_width;
- gint border_width;
gboolean need_sliders = FALSE;
gint up_slider_offset = 0;
- gint down_slider_offset = 0;
+ GtkRequisition child_requisition;
+ gboolean needs_reorder = FALSE;
+
+ gtk_widget_set_allocation (widget, allocation);
- widget->allocation = *allocation;
+ if (gtk_widget_get_realized (widget))
+ gdk_window_move_resize (path_bar->event_window,
+ allocation->x, allocation->y,
+ allocation->width, allocation->height);
/* No path is set; we don't have to allocate anything. */
if (path_bar->button_list == NULL)
return;
direction = gtk_widget_get_direction (widget);
- border_width = (gint) GTK_CONTAINER (path_bar)->border_width;
- allocation_width = allocation->width - 2 * border_width;
+ allocation_width = allocation->width;
/* First, we check to see if we need the scrollbars. */
if (path_bar->fake_root)
width = path_bar->spacing + path_bar->slider_width;
else
- width = 0;
+ width = 0;
for (list = path_bar->button_list; list; list = list->next)
{
child = BUTTON_DATA (list->data)->button;
- width += child->requisition.width + path_bar->spacing;
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
+
+ width += child_requisition.width + path_bar->spacing;
if (list == path_bar->fake_root)
break;
}
@@ -436,19 +582,24 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
* button, then count backwards.
*/
/* Count down the path chain towards the end. */
- width = BUTTON_DATA (first_button->data)->button->requisition.width;
+ gtk_widget_get_preferred_size (BUTTON_DATA (first_button->data)->button,
+ &child_requisition, NULL);
+
+ width = child_requisition.width;
list = first_button->prev;
while (list && !reached_end)
{
child = BUTTON_DATA (list->data)->button;
- if (width + child->requisition.width +
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
+
+ if (width + child_requisition.width +
path_bar->spacing + slider_space > allocation_width)
reached_end = TRUE;
else if (list == path_bar->fake_root)
break;
else
- width += child->requisition.width + path_bar->spacing;
+ width += child_requisition.width + path_bar->spacing;
list = list->prev;
}
@@ -459,13 +610,15 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
{
child = BUTTON_DATA (first_button->next->data)->button;
- if (width + child->requisition.width + path_bar->spacing + slider_space > allocation_width)
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
+
+ if (width + child_requisition.width + path_bar->spacing + slider_space > allocation_width)
{
reached_end = TRUE;
}
else
{
- width += child->requisition.width + path_bar->spacing;
+ width += child_requisition.width + path_bar->spacing;
if (first_button == path_bar->fake_root)
break;
first_button = first_button->next;
@@ -474,74 +627,89 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
}
/* Now, we allocate space to the buttons */
- child_allocation.y = allocation->y + border_width;
- child_allocation.height = MAX (1, (gint) allocation->height - border_width * 2);
+ child_allocation.y = allocation->y;
+ child_allocation.height = allocation->height;
if (direction == GTK_TEXT_DIR_RTL)
{
- child_allocation.x = allocation->x + allocation->width - border_width;
+ child_allocation.x = allocation->x + allocation->width;
if (need_sliders || path_bar->fake_root)
{
child_allocation.x -= (path_bar->spacing + path_bar->slider_width);
- up_slider_offset = allocation->width - border_width - path_bar->slider_width;
+ up_slider_offset = allocation->width - path_bar->slider_width;
}
}
else
{
- child_allocation.x = allocation->x + border_width;
+ child_allocation.x = allocation->x;
if (need_sliders || path_bar->fake_root)
{
- up_slider_offset = border_width;
+ up_slider_offset = 0;
child_allocation.x += (path_bar->spacing + path_bar->slider_width);
}
}
for (list = first_button; list; list = list->prev)
{
- child = BUTTON_DATA (list->data)->button;
+ GtkAllocation widget_allocation;
+ ButtonData *button_data;
+
+ button_data = BUTTON_DATA (list->data);
+ child = button_data->button;
+
+ gtk_widget_get_preferred_size (child, &child_requisition, NULL);
+
+ child_allocation.width = MIN (child_requisition.width,
+ allocation_width - (path_bar->spacing + path_bar->slider_width) * 2);
- child_allocation.width = child->requisition.width;
if (direction == GTK_TEXT_DIR_RTL)
child_allocation.x -= child_allocation.width;
/* Check to see if we've don't have any more space to allocate buttons */
if (need_sliders && direction == GTK_TEXT_DIR_RTL)
{
- if (child_allocation.x - path_bar->spacing - path_bar->slider_width < widget->allocation.x + border_width)
+ gtk_widget_get_allocation (widget, &widget_allocation);
+ if (child_allocation.x - path_bar->spacing - path_bar->slider_width < widget_allocation.x)
break;
}
else if (need_sliders && direction == GTK_TEXT_DIR_LTR)
{
+ gtk_widget_get_allocation (widget, &widget_allocation);
if (child_allocation.x + child_allocation.width + path_bar->spacing + path_bar->slider_width >
- widget->allocation.x + border_width + allocation_width)
+ widget_allocation.x + allocation_width)
break;
}
- gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, TRUE);
+ if (child_allocation.width < child_requisition.width)
+ {
+ if (!gtk_widget_get_has_tooltip (child))
+ gtk_widget_set_tooltip_text (child, button_data->dir_name);
+ }
+ else if (gtk_widget_get_has_tooltip (child))
+ gtk_widget_set_tooltip_text (child, NULL);
+
+ needs_reorder |= gtk_widget_get_child_visible (child) == FALSE;
+ gtk_widget_set_child_visible (child, TRUE);
gtk_widget_size_allocate (child, &child_allocation);
if (direction == GTK_TEXT_DIR_RTL)
- {
- child_allocation.x -= path_bar->spacing;
- down_slider_offset = child_allocation.x - widget->allocation.x - path_bar->slider_width;
- down_slider_offset = border_width;
- }
+ child_allocation.x -= path_bar->spacing;
else
- {
- down_slider_offset = child_allocation.x - widget->allocation.x;
- down_slider_offset = allocation->width - border_width - path_bar->slider_width;
- child_allocation.x += child_allocation.width + path_bar->spacing;
- }
+ child_allocation.x += child_allocation.width + path_bar->spacing;
}
/* Now we go hide all the widgets that don't fit */
while (list)
{
- gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, FALSE);
+ child = BUTTON_DATA (list->data)->button;
+ needs_reorder |= gtk_widget_get_child_visible (child) == TRUE;
+ gtk_widget_set_child_visible (child, FALSE);
list = list->prev;
}
for (list = first_button->next; list; list = list->next)
{
- gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, FALSE);
+ child = BUTTON_DATA (list->data)->button;
+ needs_reorder |= gtk_widget_get_child_visible (child) == TRUE;
+ gtk_widget_set_child_visible (child, FALSE);
}
if (need_sliders || path_bar->fake_root)
@@ -550,32 +718,48 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
child_allocation.x = up_slider_offset + allocation->x;
gtk_widget_size_allocate (path_bar->up_slider_button, &child_allocation);
+ needs_reorder |= gtk_widget_get_child_visible (path_bar->up_slider_button) == FALSE;
gtk_widget_set_child_visible (path_bar->up_slider_button, TRUE);
gtk_widget_show_all (path_bar->up_slider_button);
}
else
- gtk_widget_set_child_visible (path_bar->up_slider_button, FALSE);
+ {
+ needs_reorder |= gtk_widget_get_child_visible (path_bar->up_slider_button) == TRUE;
+ gtk_widget_set_child_visible (path_bar->up_slider_button, FALSE);
+ }
if (need_sliders)
{
child_allocation.width = path_bar->slider_width;
- child_allocation.x = down_slider_offset + allocation->x;
+
+ if (direction == GTK_TEXT_DIR_RTL)
+ child_allocation.x = 0;
+ else
+ child_allocation.x = allocation->width - path_bar->slider_width;
+
+ child_allocation.x += allocation->x;
+
gtk_widget_size_allocate (path_bar->down_slider_button, &child_allocation);
+ needs_reorder |= gtk_widget_get_child_visible (path_bar->down_slider_button) == FALSE;
gtk_widget_set_child_visible (path_bar->down_slider_button, TRUE);
gtk_widget_show_all (path_bar->down_slider_button);
gtk_path_bar_update_slider_buttons (path_bar);
}
else
- gtk_widget_set_child_visible (path_bar->down_slider_button, FALSE);
+ {
+ needs_reorder |= gtk_widget_get_child_visible (path_bar->down_slider_button) == TRUE;
+ gtk_widget_set_child_visible (path_bar->down_slider_button, FALSE);
+ }
+
+ if (needs_reorder)
+ child_ordering_changed (path_bar);
}
static void
-gtk_path_bar_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_path_bar_style_updated (GtkWidget *widget)
{
- if (GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set)
- GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set (widget, previous_style);
+ GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_updated (widget);
gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
}
@@ -594,9 +778,31 @@ gtk_path_bar_screen_changed (GtkWidget *widget,
gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
}
+static gboolean
+gtk_path_bar_scroll (GtkWidget *widget,
+ GdkEventScroll *event)
+{
+ switch (event->direction)
+ {
+ case GDK_SCROLL_RIGHT:
+ case GDK_SCROLL_DOWN:
+ gtk_path_bar_scroll_down (GTK_PATH_BAR (widget));
+ break;
+ case GDK_SCROLL_LEFT:
+ case GDK_SCROLL_UP:
+ gtk_path_bar_scroll_up (GTK_PATH_BAR (widget));
+ break;
+ case GDK_SCROLL_SMOOTH:
+ break;
+ }
+
+ return TRUE;
+}
+
static void
gtk_path_bar_add (GtkContainer *container,
GtkWidget *widget)
+
{
gtk_widget_set_parent (widget, GTK_WIDGET (container));
}
@@ -605,7 +811,7 @@ static void
gtk_path_bar_remove_1 (GtkContainer *container,
GtkWidget *widget)
{
- gboolean was_visible = GTK_WIDGET_VISIBLE (widget);
+ gboolean was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
if (was_visible)
gtk_widget_queue_resize (GTK_WIDGET (container));
@@ -678,16 +884,89 @@ gtk_path_bar_forall (GtkContainer *container,
(* callback) (path_bar->down_slider_button, callback_data);
}
+static GtkWidgetPath *
+gtk_path_bar_get_path_for_child (GtkContainer *container,
+ GtkWidget *child)
+{
+ GtkPathBar *path_bar = GTK_PATH_BAR (container);
+ GtkWidgetPath *path;
+
+ path = _gtk_widget_create_path (GTK_WIDGET (path_bar));
+
+ if (gtk_widget_get_visible (child) &&
+ gtk_widget_get_child_visible (child))
+ {
+ GtkWidgetPath *sibling_path;
+ GList *visible_children;
+ GList *l;
+ int pos;
+
+ /* 1. Build the list of visible children, in visually left-to-right order
+ * (i.e. independently of the widget's direction). Note that our
+ * button_list is stored in innermost-to-outermost path order!
+ */
+
+ visible_children = NULL;
+
+ if (gtk_widget_get_visible (path_bar->down_slider_button) &&
+ gtk_widget_get_child_visible (path_bar->down_slider_button))
+ visible_children = g_list_prepend (visible_children, path_bar->down_slider_button);
+
+ for (l = path_bar->button_list; l; l = l->next)
+ {
+ ButtonData *data = l->data;
+
+ if (gtk_widget_get_visible (data->button) &&
+ gtk_widget_get_child_visible (data->button))
+ visible_children = g_list_prepend (visible_children, data->button);
+ }
+
+ if (gtk_widget_get_visible (path_bar->up_slider_button) &&
+ gtk_widget_get_child_visible (path_bar->up_slider_button))
+ visible_children = g_list_prepend (visible_children, path_bar->up_slider_button);
+
+ if (gtk_widget_get_direction (GTK_WIDGET (path_bar)) == GTK_TEXT_DIR_RTL)
+ visible_children = g_list_reverse (visible_children);
+
+ /* 2. Find the index of the child within that list */
+
+ pos = 0;
+
+ for (l = visible_children; l; l = l->next)
+ {
+ GtkWidget *button = l->data;
+
+ if (button == child)
+ break;
+
+ pos++;
+ }
+
+ /* 3. Build the path */
+
+ sibling_path = gtk_widget_path_new ();
+
+ for (l = visible_children; l; l = l->next)
+ gtk_widget_path_append_for_widget (sibling_path, l->data);
+
+ gtk_widget_path_append_with_siblings (path, sibling_path, pos);
+
+ g_list_free (visible_children);
+ gtk_widget_path_unref (sibling_path);
+ }
+ else
+ gtk_widget_path_append_for_widget (path, child);
+
+ return path;
+}
+
static void
-gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar)
+gtk_path_bar_scroll_down (GtkPathBar *path_bar)
{
+ GtkAllocation allocation, button_allocation;
GList *list;
GList *down_button = NULL;
- GList *up_button = NULL;
gint space_available;
- gint space_needed;
- gint border_width;
- GtkTextDirection direction;
if (path_bar->ignore_click)
{
@@ -695,11 +974,14 @@ gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar)
return;
}
+ if (gtk_widget_get_child_visible (BUTTON_DATA (path_bar->button_list->data)->button))
+ {
+ /* Return if the last button is already visible */
+ return;
+ }
+
gtk_widget_queue_resize (GTK_WIDGET (path_bar));
- border_width = GTK_CONTAINER (path_bar)->border_width;
- direction = gtk_widget_get_direction (GTK_WIDGET (path_bar));
-
/* We find the button at the 'down' end that we have to make
* visible */
for (list = path_bar->button_list; list; list = list->next)
@@ -710,42 +992,31 @@ gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar)
break;
}
}
-
- /* Find the last visible button on the 'up' end
- */
- for (list = g_list_last (path_bar->button_list); list; list = list->prev)
- {
- if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button))
- {
- up_button = list;
- break;
- }
- }
- /* We check if down_button might be NULL in cases where the pathbar's horizontal size is smaller
- * than the button and it doesn't get displayed. e.g., on Windows it might be "My Documents and Settings"
+ gtk_widget_get_allocation (GTK_WIDGET (path_bar), &allocation);
+ gtk_widget_get_allocation (BUTTON_DATA (down_button->data)->button, &button_allocation);
+
+ space_available = (allocation.width
+ - 2 * path_bar->spacing - 2 * path_bar->slider_width
+ - button_allocation.width);
+ path_bar->first_scrolled_button = down_button;
+
+ /* We have space_available free space that's not being used.
+ * So we walk down from the end, adding buttons until we use all free space.
*/
- space_needed = down_button ? BUTTON_DATA (down_button->data)->button->allocation.width : 0 + path_bar->spacing;
- if (direction == GTK_TEXT_DIR_RTL)
- space_available = path_bar->down_slider_button->allocation.x - GTK_WIDGET (path_bar)->allocation.x;
- else
- space_available = (GTK_WIDGET (path_bar)->allocation.x + GTK_WIDGET (path_bar)->allocation.width - border_width) -
- (path_bar->down_slider_button->allocation.x + path_bar->down_slider_button->allocation.width);
-
- /* We have space_available extra space that's not being used. We
- * need space_needed space to make the button fit. So we walk down
- * from the end, removing buttons until we get all the space we
- * need. */
- while (space_available < space_needed)
+ while (space_available > 0)
{
- space_available += BUTTON_DATA (up_button->data)->button->allocation.width + path_bar->spacing;
- up_button = up_button->prev;
- path_bar->first_scrolled_button = up_button;
+ path_bar->first_scrolled_button = down_button;
+ down_button = down_button->next;
+ if (!down_button)
+ break;
+ space_available -= (button_allocation.width
+ + path_bar->spacing);
}
}
static void
-gtk_path_bar_scroll_up (GtkWidget *button, GtkPathBar *path_bar)
+gtk_path_bar_scroll_up (GtkPathBar *path_bar)
{
GList *list;
@@ -755,9 +1026,17 @@ gtk_path_bar_scroll_up (GtkWidget *button, GtkPathBar *path_bar)
return;
}
+ list = g_list_last (path_bar->button_list);
+
+ if (gtk_widget_get_child_visible (BUTTON_DATA (list->data)->button))
+ {
+ /* Return if the first button is already visible */
+ return;
+ }
+
gtk_widget_queue_resize (GTK_WIDGET (path_bar));
- for (list = g_list_last (path_bar->button_list); list; list = list->prev)
+ for ( ; list; list = list->prev)
{
if (list->prev && gtk_widget_get_child_visible (BUTTON_DATA (list->prev->data)->button))
{
@@ -777,9 +1056,9 @@ gtk_path_bar_scroll_timeout (GtkPathBar *path_bar)
if (path_bar->timer)
{
if (path_bar->scrolling_up)
- gtk_path_bar_scroll_up (path_bar->up_slider_button, path_bar);
+ gtk_path_bar_scroll_up (path_bar);
else if (path_bar->scrolling_down)
- gtk_path_bar_scroll_down (path_bar->down_slider_button, path_bar);
+ gtk_path_bar_scroll_down (path_bar);
if (path_bar->need_timer)
{
@@ -833,7 +1112,7 @@ gtk_path_bar_slider_up_defocus (GtkWidget *widget,
}
/* don't let the focus vanish */
- if ((!GTK_WIDGET_IS_SENSITIVE (path_bar->up_slider_button)) ||
+ if ((!gtk_widget_is_sensitive (path_bar->up_slider_button)) ||
(!gtk_widget_get_child_visible (path_bar->up_slider_button)))
gtk_widget_grab_focus (BUTTON_DATA (up_button->data)->button);
@@ -861,7 +1140,7 @@ gtk_path_bar_slider_down_defocus (GtkWidget *widget,
}
/* don't let the focus vanish */
- if ((!GTK_WIDGET_IS_SENSITIVE (path_bar->down_slider_button)) ||
+ if ((!gtk_widget_is_sensitive (path_bar->down_slider_button)) ||
(!gtk_widget_get_child_visible (path_bar->down_slider_button)))
gtk_widget_grab_focus (BUTTON_DATA (down_button->data)->button);
@@ -873,7 +1152,7 @@ gtk_path_bar_slider_button_press (GtkWidget *widget,
GdkEventButton *event,
GtkPathBar *path_bar)
{
- if (event->type != GDK_BUTTON_PRESS || event->button != 1)
+ if (event->type != GDK_BUTTON_PRESS || event->button != GDK_BUTTON_PRIMARY)
return FALSE;
path_bar->ignore_click = FALSE;
@@ -882,13 +1161,13 @@ gtk_path_bar_slider_button_press (GtkWidget *widget,
{
path_bar->scrolling_down = FALSE;
path_bar->scrolling_up = TRUE;
- gtk_path_bar_scroll_up (path_bar->up_slider_button, path_bar);
+ gtk_path_bar_scroll_up (path_bar);
}
else if (widget == path_bar->down_slider_button)
{
path_bar->scrolling_up = FALSE;
path_bar->scrolling_down = TRUE;
- gtk_path_bar_scroll_down (path_bar->down_slider_button, path_bar);
+ gtk_path_bar_scroll_down (path_bar);
}
if (!path_bar->timer)
@@ -933,7 +1212,7 @@ static void
gtk_path_bar_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
- if (!GTK_WIDGET_IS_SENSITIVE (widget))
+ if (!gtk_widget_is_sensitive (widget))
gtk_path_bar_stop_scrolling (GTK_PATH_BAR (widget));
}
@@ -1039,13 +1318,13 @@ button_clicked_cb (GtkWidget *button,
GtkPathBar *path_bar;
GList *button_list;
gboolean child_is_hidden;
- GtkFilePath *child_path;
+ GFile *child_file;
button_data = BUTTON_DATA (data);
if (button_data->ignore_changes)
return;
- path_bar = GTK_PATH_BAR (button->parent);
+ path_bar = GTK_PATH_BAR (gtk_widget_get_parent (button));
button_list = g_list_find (path_bar->button_list, button_data);
g_assert (button_list != NULL);
@@ -1061,17 +1340,17 @@ button_clicked_cb (GtkWidget *button,
ButtonData *child_data;
child_data = BUTTON_DATA (button_list->prev->data);
- child_path = child_data->path;
+ child_file = child_data->file;
child_is_hidden = child_data->file_is_hidden;
}
else
{
- child_path = NULL;
+ child_file = NULL;
child_is_hidden = FALSE;
}
g_signal_emit (path_bar, path_bar_signals [PATH_CLICKED], 0,
- button_data->path, child_path, child_is_hidden);
+ button_data->file, child_file, child_is_hidden);
}
struct SetButtonImageData
@@ -1081,19 +1360,19 @@ struct SetButtonImageData
};
static void
-set_button_image_get_info_cb (GtkFileSystemHandle *handle,
- const GtkFileInfo *info,
- const GError *error,
- gpointer user_data)
+set_button_image_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
{
- gboolean cancelled = handle->cancelled;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GdkPixbuf *pixbuf;
struct SetButtonImageData *data = user_data;
- if (handle != data->button_data->handle)
+ if (cancellable != data->button_data->cancellable)
goto out;
- data->button_data->handle = NULL;
+ data->button_data->cancellable = NULL;
if (!data->button_data->button)
{
@@ -1104,8 +1383,8 @@ set_button_image_get_info_cb (GtkFileSystemHandle *handle,
if (cancelled || error)
goto out;
- pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->path_bar),
- data->path_bar->icon_size, NULL);
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->path_bar),
+ data->path_bar->icon_size);
gtk_image_set_from_pixbuf (GTK_IMAGE (data->button_data->image), pixbuf);
switch (data->button_data->type)
@@ -1130,7 +1409,7 @@ set_button_image_get_info_cb (GtkFileSystemHandle *handle,
out:
g_free (data);
- g_object_unref (handle);
+ g_object_unref (cancellable);
}
static void
@@ -1149,17 +1428,16 @@ set_button_image (GtkPathBar *path_bar,
gtk_image_set_from_pixbuf (GTK_IMAGE (button_data->image), path_bar->root_icon);
break;
}
-
- volume = gtk_file_system_get_volume_for_path (path_bar->file_system, path_bar->root_path);
+
+ volume = _gtk_file_system_get_volume_for_file (path_bar->file_system, path_bar->root_file);
if (volume == NULL)
return;
- path_bar->root_icon = gtk_file_system_volume_render_icon (path_bar->file_system,
- volume,
- GTK_WIDGET (path_bar),
- path_bar->icon_size,
- NULL);
- gtk_file_system_volume_free (path_bar->file_system, volume);
+ path_bar->root_icon = _gtk_file_system_volume_render_icon (volume,
+ GTK_WIDGET (path_bar),
+ path_bar->icon_size,
+ NULL);
+ _gtk_file_system_volume_unref (volume);
gtk_image_set_from_pixbuf (GTK_IMAGE (button_data->image), path_bar->root_icon);
break;
@@ -1175,15 +1453,15 @@ set_button_image (GtkPathBar *path_bar,
data->path_bar = path_bar;
data->button_data = button_data;
- if (button_data->handle)
- gtk_file_system_cancel_operation (button_data->handle);
+ if (button_data->cancellable)
+ g_cancellable_cancel (button_data->cancellable);
- button_data->handle =
- gtk_file_system_get_info (path_bar->file_system,
- path_bar->home_path,
- GTK_FILE_INFO_ICON,
- set_button_image_get_info_cb,
- data);
+ button_data->cancellable =
+ _gtk_file_system_get_info (path_bar->file_system,
+ path_bar->home_file,
+ "standard::icon",
+ set_button_image_get_info_cb,
+ data);
break;
case DESKTOP_BUTTON:
@@ -1197,15 +1475,15 @@ set_button_image (GtkPathBar *path_bar,
data->path_bar = path_bar;
data->button_data = button_data;
- if (button_data->handle)
- gtk_file_system_cancel_operation (button_data->handle);
+ if (button_data->cancellable)
+ g_cancellable_cancel (button_data->cancellable);
- button_data->handle =
- gtk_file_system_get_info (path_bar->file_system,
- path_bar->desktop_path,
- GTK_FILE_INFO_ICON,
- set_button_image_get_info_cb,
- data);
+ button_data->cancellable =
+ _gtk_file_system_get_info (path_bar->file_system,
+ path_bar->desktop_file,
+ "standard::icon",
+ set_button_image_get_info_cb,
+ data);
break;
default:
break;
@@ -1215,17 +1493,17 @@ set_button_image (GtkPathBar *path_bar,
static void
button_data_free (ButtonData *button_data)
{
- if (button_data->path)
- gtk_file_path_free (button_data->path);
- button_data->path = NULL;
+ if (button_data->file)
+ g_object_unref (button_data->file);
+ button_data->file = NULL;
g_free (button_data->dir_name);
button_data->dir_name = NULL;
button_data->button = NULL;
- if (button_data->handle)
- gtk_file_system_cancel_operation (button_data->handle);
+ if (button_data->cancellable)
+ g_cancellable_cancel (button_data->cancellable);
else
g_free (button_data);
}
@@ -1240,25 +1518,25 @@ get_dir_name (ButtonData *button_data)
* or not the contents are bold
*/
static void
-label_size_request_cb (GtkWidget *widget,
- GtkRequisition *requisition,
- ButtonData *button_data)
+set_label_size_request (GtkWidget *widget,
+ ButtonData *button_data)
{
const gchar *dir_name = get_dir_name (button_data);
PangoLayout *layout = gtk_widget_create_pango_layout (button_data->label, dir_name);
- gint bold_width, bold_height;
+ gint width, height, bold_width, bold_height;
gchar *markup;
-
- pango_layout_get_pixel_size (layout, &requisition->width, &requisition->height);
+
+ pango_layout_get_pixel_size (layout, &width, &height);
markup = g_markup_printf_escaped ("%s", dir_name);
pango_layout_set_markup (layout, markup, -1);
g_free (markup);
pango_layout_get_pixel_size (layout, &bold_width, &bold_height);
- requisition->width = MAX (requisition->width, bold_width);
- requisition->height = MAX (requisition->height, bold_height);
-
+
+ gtk_widget_set_size_request (widget,
+ MAX (width, bold_width),
+ MAX (height, bold_height));
g_object_unref (layout);
}
@@ -1300,63 +1578,62 @@ gtk_path_bar_update_button_appearance (GtkPathBar *path_bar,
static ButtonType
find_button_type (GtkPathBar *path_bar,
- GtkFilePath *path)
+ GFile *file)
{
- if (path_bar->root_path != NULL &&
- ! gtk_file_path_compare (path, path_bar->root_path))
+ if (path_bar->root_file != NULL &&
+ g_file_equal (file, path_bar->root_file))
return ROOT_BUTTON;
- if (path_bar->home_path != NULL &&
- ! gtk_file_path_compare (path, path_bar->home_path))
+ if (path_bar->home_file != NULL &&
+ g_file_equal (file, path_bar->home_file))
return HOME_BUTTON;
- if (path_bar->desktop_path != NULL &&
- ! gtk_file_path_compare (path, path_bar->desktop_path))
+ if (path_bar->desktop_file != NULL &&
+ g_file_equal (file, path_bar->desktop_file))
return DESKTOP_BUTTON;
return NORMAL_BUTTON;
}
static void
-button_drag_data_get_cb (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *selection_data,
- guint info,
- guint time_,
- gpointer data)
+button_drag_data_get_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time_,
+ gpointer data)
{
ButtonData *button_data;
- GtkPathBar *path_bar;
char *uris[2];
button_data = data;
- path_bar = GTK_PATH_BAR (widget->parent); /* the button's parent *is* the path bar */
- uris[0] = gtk_file_system_path_to_uri (path_bar->file_system, button_data->path);
+ uris[0] = g_file_get_uri (button_data->file);
uris[1] = NULL;
gtk_selection_data_set_uris (selection_data, uris);
+
g_free (uris[0]);
}
static ButtonData *
make_directory_button (GtkPathBar *path_bar,
const char *dir_name,
- GtkFilePath *path,
+ GFile *file,
gboolean current_dir,
gboolean file_is_hidden)
{
AtkObject *atk_obj;
GtkWidget *child = NULL;
- GtkWidget *label_alignment = NULL;
ButtonData *button_data;
file_is_hidden = !! file_is_hidden;
/* Is it a special button? */
button_data = g_new0 (ButtonData, 1);
- button_data->type = find_button_type (path_bar, path);
+ button_data->type = find_button_type (path_bar, file);
button_data->button = gtk_toggle_button_new ();
atk_obj = gtk_widget_get_accessible (button_data->button);
gtk_button_set_focus_on_click (GTK_BUTTON (button_data->button), FALSE);
+ gtk_widget_add_events (button_data->button, GDK_SCROLL_MASK);
switch (button_data->type)
{
@@ -1370,33 +1647,29 @@ make_directory_button (GtkPathBar *path_bar,
case DESKTOP_BUTTON:
button_data->image = gtk_image_new ();
button_data->label = gtk_label_new (NULL);
- label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
- gtk_container_add (GTK_CONTAINER (label_alignment), button_data->label);
- child = gtk_hbox_new (FALSE, 2);
+ child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (child), label_alignment, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE, FALSE, 0);
break;
case NORMAL_BUTTON:
default:
button_data->label = gtk_label_new (NULL);
- label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
- gtk_container_add (GTK_CONTAINER (label_alignment), button_data->label);
- child = label_alignment;
+ gtk_label_set_ellipsize (GTK_LABEL (button_data->label), PANGO_ELLIPSIZE_END);
+ child = button_data->label;
button_data->image = NULL;
}
- /* label_alignment is created because we can't override size-request
- * on label itself and still have the contents of the label centered
- * properly in the label's requisition
- */
- if (label_alignment)
- g_signal_connect (label_alignment, "size-request",
- G_CALLBACK (label_size_request_cb), button_data);
-
button_data->dir_name = g_strdup (dir_name);
- button_data->path = gtk_file_path_new_dup (gtk_file_path_get_string (path));
+ button_data->file = g_object_ref (file);
button_data->file_is_hidden = file_is_hidden;
-
+
+ /*
+ * The following function ensures that the alignment will always
+ * request the same size whether the button's text is bold or not.
+ */
+ if (button_data->label)
+ set_label_size_request (button_data->label, button_data);
+
gtk_container_add (GTK_CONTAINER (button_data->button), child);
gtk_widget_show_all (button_data->button);
@@ -1413,7 +1686,7 @@ make_directory_button (GtkPathBar *path_bar,
NULL, 0,
GDK_ACTION_COPY);
gtk_drag_source_add_uri_targets (button_data->button);
- g_signal_connect (button_data->button, "drag_data_get",
+ g_signal_connect (button_data->button, "drag-data-get",
G_CALLBACK (button_drag_data_get_cb), button_data);
return button_data;
@@ -1421,8 +1694,7 @@ make_directory_button (GtkPathBar *path_bar,
static gboolean
gtk_path_bar_check_parent_path (GtkPathBar *path_bar,
- const GtkFilePath *file_path,
- GtkFileSystem *file_system)
+ GFile *file)
{
GList *list;
GList *current_path = NULL;
@@ -1433,7 +1705,7 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar,
ButtonData *button_data;
button_data = list->data;
- if (! gtk_file_path_compare (file_path, button_data->path))
+ if (g_file_equal (file, button_data->file))
{
current_path = list;
break;
@@ -1479,10 +1751,10 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar,
}
-struct SetPathInfo
+struct SetFileInfo
{
- GtkFilePath *path;
- GtkFilePath *parent_path;
+ GFile *file;
+ GFile *parent_file;
GtkPathBar *path_bar;
GList *new_buttons;
GList *fake_root;
@@ -1490,8 +1762,8 @@ struct SetPathInfo
};
static void
-gtk_path_bar_set_path_finish (struct SetPathInfo *info,
- gboolean result)
+gtk_path_bar_set_file_finish (struct SetFileInfo *info,
+ gboolean result)
{
if (result)
{
@@ -1506,6 +1778,8 @@ gtk_path_bar_set_path_finish (struct SetPathInfo *info,
GtkWidget *button = BUTTON_DATA (l->data)->button;
gtk_container_add (GTK_CONTAINER (info->path_bar), button);
}
+
+ child_ordering_changed (info->path_bar);
}
else
{
@@ -1522,130 +1796,113 @@ gtk_path_bar_set_path_finish (struct SetPathInfo *info,
g_list_free (info->new_buttons);
}
- if (info->path)
- gtk_file_path_free (info->path);
- if (info->parent_path)
- gtk_file_path_free (info->parent_path);
+ if (info->file)
+ g_object_unref (info->file);
+ if (info->parent_file)
+ g_object_unref (info->parent_file);
+
g_free (info);
}
static void
-gtk_path_bar_get_info_callback (GtkFileSystemHandle *handle,
- const GtkFileInfo *file_info,
- const GError *error,
- gpointer data)
+gtk_path_bar_get_info_callback (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer data)
{
- gboolean cancelled = handle->cancelled;
- struct SetPathInfo *path_info = data;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+ struct SetFileInfo *file_info = data;
ButtonData *button_data;
const gchar *display_name;
gboolean is_hidden;
- gboolean valid;
- if (handle != path_info->path_bar->set_path_handle)
+ if (cancellable != file_info->path_bar->get_info_cancellable)
{
- gtk_path_bar_set_path_finish (path_info, FALSE);
- g_object_unref (handle);
+ gtk_path_bar_set_file_finish (file_info, FALSE);
+ g_object_unref (cancellable);
return;
}
- g_object_unref (handle);
- path_info->path_bar->set_path_handle = NULL;
+ g_object_unref (cancellable);
+ file_info->path_bar->get_info_cancellable = NULL;
- if (cancelled || !file_info)
+ if (cancelled || !info)
{
- gtk_path_bar_set_path_finish (path_info, FALSE);
+ gtk_path_bar_set_file_finish (file_info, FALSE);
return;
}
- display_name = gtk_file_info_get_display_name (file_info);
- is_hidden = gtk_file_info_get_is_hidden (file_info);
+ display_name = g_file_info_get_display_name (info);
+ is_hidden = g_file_info_get_is_hidden (info) || g_file_info_get_is_backup (info);
gtk_widget_push_composite_child ();
- button_data = make_directory_button (path_info->path_bar, display_name,
- path_info->path,
- path_info->first_directory, is_hidden);
+ button_data = make_directory_button (file_info->path_bar, display_name,
+ file_info->file,
+ file_info->first_directory, is_hidden);
gtk_widget_pop_composite_child ();
- gtk_file_path_free (path_info->path);
+ g_object_unref (file_info->file);
- path_info->new_buttons = g_list_prepend (path_info->new_buttons, button_data);
+ file_info->new_buttons = g_list_prepend (file_info->new_buttons, button_data);
if (BUTTON_IS_FAKE_ROOT (button_data))
- path_info->fake_root = path_info->new_buttons;
+ file_info->fake_root = file_info->new_buttons;
- path_info->path = path_info->parent_path;
- path_info->first_directory = FALSE;
+ /* We have assigned the info for the innermost button, i.e. the deepest directory.
+ * Now, go on to fetch the info for this directory's parent.
+ */
- if (!path_info->path)
- {
- gtk_path_bar_set_path_finish (path_info, TRUE);
- return;
- }
+ file_info->file = file_info->parent_file;
+ file_info->first_directory = FALSE;
- valid = gtk_file_system_get_parent (path_info->path_bar->file_system,
- path_info->path,
- &path_info->parent_path,
- NULL);
- if (!valid)
+ if (!file_info->file)
{
- gtk_path_bar_set_path_finish (path_info, FALSE);
+ /* No parent? Okay, we are done. */
+ gtk_path_bar_set_file_finish (file_info, TRUE);
return;
}
- path_info->path_bar->set_path_handle =
- gtk_file_system_get_info (handle->file_system,
- path_info->path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_HIDDEN,
- gtk_path_bar_get_info_callback,
- path_info);
+ file_info->parent_file = g_file_get_parent (file_info->file);
+
+ /* Recurse asynchronously */
+ file_info->path_bar->get_info_cancellable =
+ _gtk_file_system_get_info (file_info->path_bar->file_system,
+ file_info->file,
+ "standard::display-name,standard::is-hidden,standard::is-backup",
+ gtk_path_bar_get_info_callback,
+ file_info);
}
-gboolean
-_gtk_path_bar_set_path (GtkPathBar *path_bar,
- const GtkFilePath *file_path,
- const gboolean keep_trail,
- GError **error)
+void
+_gtk_path_bar_set_file (GtkPathBar *path_bar,
+ GFile *file,
+ const gboolean keep_trail)
{
- struct SetPathInfo *info;
- gboolean result;
+ struct SetFileInfo *info;
- g_return_val_if_fail (GTK_IS_PATH_BAR (path_bar), FALSE);
- g_return_val_if_fail (file_path != NULL, FALSE);
-
- result = TRUE;
+ g_return_if_fail (GTK_IS_PATH_BAR (path_bar));
+ g_return_if_fail (G_IS_FILE (file));
/* Check whether the new path is already present in the pathbar as buttons.
* This could be a parent directory or a previous selected subdirectory.
*/
- if (keep_trail &&
- gtk_path_bar_check_parent_path (path_bar, file_path, path_bar->file_system))
- return TRUE;
+ if (keep_trail && gtk_path_bar_check_parent_path (path_bar, file))
+ return;
- info = g_new0 (struct SetPathInfo, 1);
- info->path = gtk_file_path_copy (file_path);
+ info = g_new0 (struct SetFileInfo, 1);
+ info->file = g_object_ref (file);
info->path_bar = path_bar;
info->first_directory = TRUE;
+ info->parent_file = g_file_get_parent (info->file);
- result = gtk_file_system_get_parent (path_bar->file_system,
- info->path, &info->parent_path, error);
- if (!result)
- {
- gtk_file_path_free (info->path);
- g_free (info);
- return result;
- }
-
- if (path_bar->set_path_handle)
- gtk_file_system_cancel_operation (path_bar->set_path_handle);
+ if (path_bar->get_info_cancellable)
+ g_cancellable_cancel (path_bar->get_info_cancellable);
- path_bar->set_path_handle =
- gtk_file_system_get_info (path_bar->file_system,
- info->path,
- GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_HIDDEN,
- gtk_path_bar_get_info_callback,
- info);
-
- return TRUE;
+ path_bar->get_info_cancellable =
+ _gtk_file_system_get_info (path_bar->file_system,
+ info->file,
+ "standard::display-name,standard::is-hidden,standard::is-backup",
+ gtk_path_bar_get_info_callback,
+ info);
}
/* FIXME: This should be a construct-only property */
@@ -1666,22 +1923,22 @@ _gtk_path_bar_set_file_system (GtkPathBar *path_bar,
{
const gchar *desktop;
- path_bar->home_path = gtk_file_system_filename_to_path (path_bar->file_system, home);
+ path_bar->home_file = g_file_new_for_path (home);
/* FIXME: Need file system backend specific way of getting the
* Desktop path.
*/
desktop = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
if (desktop != NULL)
- path_bar->desktop_path = gtk_file_system_filename_to_path (path_bar->file_system, desktop);
+ path_bar->desktop_file = g_file_new_for_path (desktop);
else
- path_bar->desktop_path = NULL;
+ path_bar->desktop_file = NULL;
}
else
{
- path_bar->home_path = NULL;
- path_bar->desktop_path = NULL;
+ path_bar->home_file = NULL;
+ path_bar->desktop_file = NULL;
}
- path_bar->root_path = gtk_file_system_filename_to_path (path_bar->file_system, "/");
+ path_bar->root_file = g_file_new_for_path ("/");
}
/**
@@ -1737,6 +1994,3 @@ _gtk_path_bar_down (GtkPathBar *path_bar)
}
}
}
-
-#define __GTK_PATH_BAR_C__
-#include "gtkaliasdef.c"