aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@src.gnome.org>2007-11-19 07:51:54 +0800
committerCosimo Cecchi <cosimoc@src.gnome.org>2007-11-19 07:51:54 +0800
commit017dbb24e54f1afe065543ab1d6de5ea9a698be2 (patch)
tree43117cb5e527da471397b0e56f1fa3b09e5d7b2d
parentd0b69001b4244546c0a2f3adf45bb0401b2d7454 (diff)
downloadgsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.tar
gsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.tar.gz
gsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.tar.bz2
gsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.tar.lz
gsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.tar.xz
gsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.tar.zst
gsoc2013-epiphany-017dbb24e54f1afe065543ab1d6de5ea9a698be2.zip
Fix a bug in EphyNodeView which caused weird problems when setting columns
as resizable; thanks to Kristian Rietveld for finding out the cause. Make history window columns resizable and bookmarks editor columns resizable and sortable. Part of bug #132808. svn path=/trunk/; revision=7718
-rw-r--r--lib/widgets/ephy-node-view.c5
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c11
-rw-r--r--src/ephy-history-window.c9
3 files changed, 20 insertions, 5 deletions
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index be95c0a1e..c32e1bd8e 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -811,6 +811,11 @@ ephy_node_view_button_press_cb (GtkWidget *treeview,
GtkTreeSelection *selection;
gboolean call_parent = TRUE, path_is_selected;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+
+ if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (treeview)))
+ {
+ return GTK_WIDGET_CLASS (parent_class)->button_press_event (treeview, event);
+ }
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview),
event->x,
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index db24028ad..5ad6f0b9b 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1937,12 +1937,19 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
(EPHY_NODE_VIEW (bm_view), _("Title"),
G_TYPE_STRING, EPHY_NODE_BMK_PROP_TITLE,
EPHY_NODE_VIEW_EDITABLE |
- EPHY_NODE_VIEW_SEARCHABLE,
+ EPHY_NODE_VIEW_SEARCHABLE |
+ EPHY_NODE_VIEW_SORTABLE,
provide_favicon, &(editor->priv->title_col));
+ gtk_tree_view_column_set_min_width (editor->priv->title_col, 300);
+ gtk_tree_view_column_set_resizable (editor->priv->title_col, TRUE);
+
url_col_id = ephy_node_view_add_column
(EPHY_NODE_VIEW (bm_view), _("Address"),
G_TYPE_STRING, EPHY_NODE_BMK_PROP_LOCATION,
- 0, NULL, &(editor->priv->address_col));
+ EPHY_NODE_VIEW_SORTABLE, NULL, &(editor->priv->address_col));
+ gtk_tree_view_column_set_min_width (editor->priv->address_col, 300);
+ gtk_tree_view_column_set_resizable (editor->priv->address_col, TRUE);
+
ephy_node_view_enable_drag_source (EPHY_NODE_VIEW (bm_view),
bmk_drag_types,
G_N_ELEMENTS (bmk_drag_types),
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index f696cd5c7..5d1de5840 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -1432,17 +1432,20 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
G_TYPE_STRING, EPHY_NODE_PAGE_PROP_TITLE,
EPHY_NODE_VIEW_SORTABLE |
EPHY_NODE_VIEW_SEARCHABLE, NULL, &col);
- gtk_tree_view_column_set_max_width (col, 250);
+ gtk_tree_view_column_set_min_width (col, 300);
+ gtk_tree_view_column_set_resizable (col, TRUE);
editor->priv->title_col = col;
+
url_col_id = ephy_node_view_add_column (EPHY_NODE_VIEW (pages_view), _("Address"),
G_TYPE_STRING, EPHY_NODE_PAGE_PROP_LOCATION,
EPHY_NODE_VIEW_SORTABLE, NULL, &col);
- gtk_tree_view_column_set_max_width (col, 200);
+ gtk_tree_view_column_set_min_width (col, 300);
+ gtk_tree_view_column_set_resizable (col, TRUE);
editor->priv->address_col = col;
+
datetime_col_id = ephy_node_view_add_column (EPHY_NODE_VIEW (pages_view), _("Date"),
G_TYPE_INT, EPHY_NODE_PAGE_PROP_LAST_VISIT,
EPHY_NODE_VIEW_SORTABLE, NULL, &col);
- gtk_tree_view_column_set_max_width (col, 200);
editor->priv->datetime_col = col;
parse_time_into_date (editor->priv->datetime_col, datetime_col_id);