Commit 60113bed authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Rework the way in which rerooting of the path bar is done, implementing


2005-06-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the
	path bar is done, implementing the following principles:
	(#137289, patch by Benjamin Otte)

	1. Re-root only if $HOME is an ancestor of the current path.

	2. When re-rooting, make sure the Left arrow appears in the path
	bar, so that you can navigate up from $HOME to /.  In that case,
	make sure the Right arrow doesn't appear if the sub-hierarchy from
	$HOME to the cwd fits in the window.

	3. Make sure that hitting Alt-Up takes you always one folder up,
	even when the path bar is re-rooted.
parent 9962a15c
2005-06-13 Matthias Clasen <mclasen@redhat.com> 2005-06-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the
path bar is done, implementing the following principles:
(#137289, patch by Benjamin Otte)
1. Re-root only if $HOME is an ancestor of the current path.
2. When re-rooting, make sure the Left arrow appears in the path
bar, so that you can navigate up from $HOME to /. In that case,
make sure the Right arrow doesn't appear if the sub-hierarchy from
$HOME to the cwd fits in the window.
3. Make sure that hitting Alt-Up takes you always one folder up,
even when the path bar is re-rooted.
* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
Try harder not to modify readonly strings. (#307541, Torsten Schoenfeld) Try harder not to modify readonly strings. (#307541, Torsten Schoenfeld)
......
2005-06-13 Matthias Clasen <mclasen@redhat.com> 2005-06-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the
path bar is done, implementing the following principles:
(#137289, patch by Benjamin Otte)
1. Re-root only if $HOME is an ancestor of the current path.
2. When re-rooting, make sure the Left arrow appears in the path
bar, so that you can navigate up from $HOME to /. In that case,
make sure the Right arrow doesn't appear if the sub-hierarchy from
$HOME to the cwd fits in the window.
3. Make sure that hitting Alt-Up takes you always one folder up,
even when the path bar is re-rooted.
* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
Try harder not to modify readonly strings. (#307541, Torsten Schoenfeld) Try harder not to modify readonly strings. (#307541, Torsten Schoenfeld)
......
2005-06-13 Matthias Clasen <mclasen@redhat.com> 2005-06-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpathbar.[hc]: Rework the way in which rerooting of the
path bar is done, implementing the following principles:
(#137289, patch by Benjamin Otte)
1. Re-root only if $HOME is an ancestor of the current path.
2. When re-rooting, make sure the Left arrow appears in the path
bar, so that you can navigate up from $HOME to /. In that case,
make sure the Right arrow doesn't appear if the sub-hierarchy from
$HOME to the cwd fits in the window.
3. Make sure that hitting Alt-Up takes you always one folder up,
even when the path bar is re-rooted.
* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label): * gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
Try harder not to modify readonly strings. (#307541, Torsten Schoenfeld) Try harder not to modify readonly strings. (#307541, Torsten Schoenfeld)
......
...@@ -69,6 +69,11 @@ struct _ButtonData ...@@ -69,6 +69,11 @@ struct _ButtonData
guint ignore_changes : 1; guint ignore_changes : 1;
guint file_is_hidden : 1; guint file_is_hidden : 1;
}; };
/* This macro is used to check if a button can be used as a fake root.
* All buttons in front of a fake root are automatically hidden when in a
* directory below a fake root and replaced with the "<" arrow button.
*/
#define BUTTON_IS_FAKE_ROOT(button) ((button)->type == HOME_BUTTON)
G_DEFINE_TYPE (GtkPathBar, G_DEFINE_TYPE (GtkPathBar,
gtk_path_bar, gtk_path_bar,
...@@ -351,17 +356,26 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -351,17 +356,26 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
allocation_width = allocation->width - 2 * border_width; allocation_width = allocation->width - 2 * border_width;
/* First, we check to see if we need the scrollbars. */ /* First, we check to see if we need the scrollbars. */
width = BUTTON_DATA (path_bar->button_list->data)->button->requisition.width; if (path_bar->fake_root)
for (list = path_bar->button_list->next; list; list = list->next) width = path_bar->spacing + path_bar->slider_width;
else
width = 0;
for (list = path_bar->button_list; list; list = list->next)
{ {
child = BUTTON_DATA (list->data)->button; child = BUTTON_DATA (list->data)->button;
width += child->requisition.width + path_bar->spacing; width += child->requisition.width + path_bar->spacing;
if (list == path_bar->fake_root)
break;
} }
if (width <= allocation_width) if (width <= allocation_width)
{ {
first_button = g_list_last (path_bar->button_list); if (path_bar->fake_root)
first_button = path_bar->fake_root;
else
first_button = g_list_last (path_bar->button_list);
} }
else else
{ {
...@@ -388,6 +402,8 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -388,6 +402,8 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
if (width + child->requisition.width + if (width + child->requisition.width +
path_bar->spacing + slider_space > allocation_width) path_bar->spacing + slider_space > allocation_width)
reached_end = TRUE; reached_end = TRUE;
else if (list == path_bar->fake_root)
break;
else else
width += child->requisition.width + path_bar->spacing; width += child->requisition.width + path_bar->spacing;
...@@ -396,7 +412,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -396,7 +412,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
/* Finally, we walk up, seeing how many of the previous buttons we can /* Finally, we walk up, seeing how many of the previous buttons we can
* add */ * add */
while (first_button->next && ! reached_end) while (first_button->next && !reached_end)
{ {
child = BUTTON_DATA (first_button->next->data)->button; child = BUTTON_DATA (first_button->next->data)->button;
...@@ -407,6 +423,8 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -407,6 +423,8 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
else 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; first_button = first_button->next;
} }
} }
...@@ -419,7 +437,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -419,7 +437,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
if (direction == GTK_TEXT_DIR_RTL) if (direction == GTK_TEXT_DIR_RTL)
{ {
child_allocation.x = allocation->x + allocation->width - border_width; child_allocation.x = allocation->x + allocation->width - border_width;
if (need_sliders) if (need_sliders || path_bar->fake_root)
{ {
child_allocation.x -= (path_bar->spacing + path_bar->slider_width); 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 - border_width - path_bar->slider_width;
...@@ -428,7 +446,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -428,7 +446,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
else else
{ {
child_allocation.x = allocation->x + border_width; child_allocation.x = allocation->x + border_width;
if (need_sliders) if (need_sliders || path_bar->fake_root)
{ {
up_slider_offset = border_width; up_slider_offset = border_width;
child_allocation.x += (path_bar->spacing + path_bar->slider_width); child_allocation.x += (path_bar->spacing + path_bar->slider_width);
...@@ -483,27 +501,30 @@ gtk_path_bar_size_allocate (GtkWidget *widget, ...@@ -483,27 +501,30 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, FALSE); gtk_widget_set_child_visible (BUTTON_DATA (list->data)->button, FALSE);
} }
if (need_sliders) if (need_sliders || path_bar->fake_root)
{ {
child_allocation.width = path_bar->slider_width; child_allocation.width = path_bar->slider_width;
child_allocation.x = up_slider_offset + allocation->x; child_allocation.x = up_slider_offset + allocation->x;
gtk_widget_size_allocate (path_bar->up_slider_button, &child_allocation); gtk_widget_size_allocate (path_bar->up_slider_button, &child_allocation);
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);
if (need_sliders)
{
child_allocation.width = path_bar->slider_width;
child_allocation.x = down_slider_offset + allocation->x; child_allocation.x = down_slider_offset + allocation->x;
gtk_widget_size_allocate (path_bar->down_slider_button, &child_allocation); gtk_widget_size_allocate (path_bar->down_slider_button, &child_allocation);
gtk_widget_set_child_visible (path_bar->up_slider_button, TRUE);
gtk_widget_set_child_visible (path_bar->down_slider_button, TRUE); gtk_widget_set_child_visible (path_bar->down_slider_button, TRUE);
gtk_widget_show_all (path_bar->up_slider_button);
gtk_widget_show_all (path_bar->down_slider_button); gtk_widget_show_all (path_bar->down_slider_button);
gtk_path_bar_update_slider_buttons (path_bar); gtk_path_bar_update_slider_buttons (path_bar);
} }
else else
{ gtk_widget_set_child_visible (path_bar->down_slider_button, FALSE);
gtk_widget_set_child_visible (path_bar->up_slider_button, FALSE);
gtk_widget_set_child_visible (path_bar->down_slider_button, FALSE);
}
} }
static void static void
...@@ -694,6 +715,8 @@ gtk_path_bar_scroll_up (GtkWidget *button, GtkPathBar *path_bar) ...@@ -694,6 +715,8 @@ gtk_path_bar_scroll_up (GtkWidget *button, GtkPathBar *path_bar)
{ {
if (list->prev && gtk_widget_get_child_visible (BUTTON_DATA (list->prev->data)->button)) if (list->prev && gtk_widget_get_child_visible (BUTTON_DATA (list->prev->data)->button))
{ {
if (list->prev == path_bar->fake_root)
path_bar->fake_root = NULL;
path_bar->first_scrolled_button = list; path_bar->first_scrolled_button = list;
return; return;
} }
...@@ -894,6 +917,7 @@ gtk_path_bar_clear_buttons (GtkPathBar *path_bar) ...@@ -894,6 +917,7 @@ gtk_path_bar_clear_buttons (GtkPathBar *path_bar)
gtk_container_remove (GTK_CONTAINER (path_bar), BUTTON_DATA (path_bar->button_list->data)->button); gtk_container_remove (GTK_CONTAINER (path_bar), BUTTON_DATA (path_bar->button_list->data)->button);
} }
path_bar->first_scrolled_button = NULL; path_bar->first_scrolled_button = NULL;
path_bar->fake_root = NULL;
} }
static void static void
...@@ -1199,6 +1223,7 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar, ...@@ -1199,6 +1223,7 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar,
{ {
GList *list; GList *list;
GList *current_path = NULL; GList *current_path = NULL;
gboolean need_new_fake_root = FALSE;
for (list = path_bar->button_list; list; list = list->next) for (list = path_bar->button_list; list; list = list->next)
{ {
...@@ -1210,10 +1235,28 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar, ...@@ -1210,10 +1235,28 @@ gtk_path_bar_check_parent_path (GtkPathBar *path_bar,
current_path = list; current_path = list;
break; break;
} }
if (list == path_bar->fake_root)
need_new_fake_root = TRUE;
} }
if (current_path) if (current_path)
{ {
if (need_new_fake_root)
{
path_bar->fake_root = NULL;
for (list = current_path; list; list = list->next)
{
ButtonData *button_data;
button_data = list->data;
if (BUTTON_IS_FAKE_ROOT (button_data))
{
path_bar->fake_root = list;
break;
}
}
}
for (list = path_bar->button_list; list; list = list->next) for (list = path_bar->button_list; list; list = list->next)
{ {
gtk_path_bar_update_button_appearance (path_bar, gtk_path_bar_update_button_appearance (path_bar,
...@@ -1241,6 +1284,7 @@ _gtk_path_bar_set_path (GtkPathBar *path_bar, ...@@ -1241,6 +1284,7 @@ _gtk_path_bar_set_path (GtkPathBar *path_bar,
gboolean first_directory = TRUE; gboolean first_directory = TRUE;
gboolean result; gboolean result;
GList *new_buttons = NULL; GList *new_buttons = NULL;
GList *fake_root = NULL;
g_return_val_if_fail (GTK_IS_PATH_BAR (path_bar), FALSE); g_return_val_if_fail (GTK_IS_PATH_BAR (path_bar), FALSE);
g_return_val_if_fail (file_path != NULL, FALSE); g_return_val_if_fail (file_path != NULL, FALSE);
...@@ -1310,11 +1354,8 @@ _gtk_path_bar_set_path (GtkPathBar *path_bar, ...@@ -1310,11 +1354,8 @@ _gtk_path_bar_set_path (GtkPathBar *path_bar,
new_buttons = g_list_prepend (new_buttons, button_data); new_buttons = g_list_prepend (new_buttons, button_data);
if (button_data->type != NORMAL_BUTTON) if (BUTTON_IS_FAKE_ROOT (button_data))
{ fake_root = new_buttons;
gtk_file_path_free (parent_path);
break;
}
path = parent_path; path = parent_path;
first_directory = FALSE; first_directory = FALSE;
...@@ -1326,6 +1367,7 @@ _gtk_path_bar_set_path (GtkPathBar *path_bar, ...@@ -1326,6 +1367,7 @@ _gtk_path_bar_set_path (GtkPathBar *path_bar,
gtk_path_bar_clear_buttons (path_bar); gtk_path_bar_clear_buttons (path_bar);
path_bar->button_list = g_list_reverse (new_buttons); path_bar->button_list = g_list_reverse (new_buttons);
path_bar->fake_root = fake_root;
for (l = path_bar->button_list; l; l = l->next) for (l = path_bar->button_list; l; l = l->next)
{ {
......
...@@ -51,6 +51,7 @@ struct _GtkPathBar ...@@ -51,6 +51,7 @@ struct _GtkPathBar
GList *button_list; GList *button_list;
GList *first_scrolled_button; GList *first_scrolled_button;
GList *fake_root;
GtkWidget *up_slider_button; GtkWidget *up_slider_button;
GtkWidget *down_slider_button; GtkWidget *down_slider_button;
guint settings_signal_id; guint settings_signal_id;
......
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