summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Hertzfeld <andy@src.gnome.org>2000-04-10 22:16:18 +0000
committerAndy Hertzfeld <andy@src.gnome.org>2000-04-10 22:16:18 +0000
commit82c9663d5d59943d600ff4c1d406928f9a40bad9 (patch)
tree08e6edbab814b3fbc4fc8c8ff62b24545157f8ee
parent6e865e79dec218521814ceafe6fe140ca8eb53ff (diff)
downloadnautilus-82c9663d5d59943d600ff4c1d406928f9a40bad9.tar.gz
fixed bug where multi-line titles in the index panel has a large vertical
fixed bug where multi-line titles in the index panel has a large vertical gap. Fixed by breaking out of loop when we find the split point.
-rw-r--r--ChangeLog-200004147
-rw-r--r--src/nautilus-index-title.c4
-rw-r--r--src/nautilus-sidebar-title.c4
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 8d9d0439d..9adabf6ea 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,5 +1,12 @@
2000-04-10 Andy Hertzfeld <andy@eazel.com>
+ * src/nautilus-index-title.c:
+ fixed bug where multi-line titles in index panel would have a big
+ vertical gap. Fixed by breaking out of the loop after it finds a
+ split point. Also, removed an unneccesary justification call.
+
+2000-04-10 Andy Hertzfeld <andy@eazel.com>
+
* components/services/startup/eazel-register.c:
added io ports to hardware configuration synopsis
diff --git a/src/nautilus-index-title.c b/src/nautilus-index-title.c
index 3c44bff5b..7b4069a24 100644
--- a/src/nautilus-index-title.c
+++ b/src/nautilus-index-title.c
@@ -291,7 +291,7 @@ nautilus_index_title_update_label (NautilusIndexTitle *index_title)
if (split_offset != 0) {
char *buffer = g_malloc(strlen(displayed_text) + 2);
- /* build the new string, with a CR inserted, also remembering them separately for measuring */
+ /* build the new string, with a blank inserted, also remembering them separately for measuring */
memcpy(buffer, displayed_text, split_offset);
buffer[split_offset] = '\n';
strcpy(&buffer[split_offset + 1], &displayed_text[split_offset]);
@@ -300,6 +300,7 @@ nautilus_index_title_update_label (NautilusIndexTitle *index_title)
g_free(displayed_text);
displayed_text = buffer;
+ break;
}
}
}
@@ -309,7 +310,6 @@ nautilus_index_title_update_label (NautilusIndexTitle *index_title)
} else {
index_title->details->title = GTK_WIDGET (gtk_label_new (displayed_text));
gtk_label_set_line_wrap (GTK_LABEL (index_title->details->title), TRUE);
- gtk_label_set_justify(GTK_LABEL(index_title->details->title), GTK_JUSTIFY_CENTER);
gtk_widget_show (index_title->details->title);
gtk_box_pack_start (GTK_BOX (index_title), index_title->details->title, 0, 0, 0);
gtk_box_reorder_child (GTK_BOX (index_title), index_title->details->title, 1);
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 3c44bff5b..7b4069a24 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -291,7 +291,7 @@ nautilus_index_title_update_label (NautilusIndexTitle *index_title)
if (split_offset != 0) {
char *buffer = g_malloc(strlen(displayed_text) + 2);
- /* build the new string, with a CR inserted, also remembering them separately for measuring */
+ /* build the new string, with a blank inserted, also remembering them separately for measuring */
memcpy(buffer, displayed_text, split_offset);
buffer[split_offset] = '\n';
strcpy(&buffer[split_offset + 1], &displayed_text[split_offset]);
@@ -300,6 +300,7 @@ nautilus_index_title_update_label (NautilusIndexTitle *index_title)
g_free(displayed_text);
displayed_text = buffer;
+ break;
}
}
}
@@ -309,7 +310,6 @@ nautilus_index_title_update_label (NautilusIndexTitle *index_title)
} else {
index_title->details->title = GTK_WIDGET (gtk_label_new (displayed_text));
gtk_label_set_line_wrap (GTK_LABEL (index_title->details->title), TRUE);
- gtk_label_set_justify(GTK_LABEL(index_title->details->title), GTK_JUSTIFY_CENTER);
gtk_widget_show (index_title->details->title);
gtk_box_pack_start (GTK_BOX (index_title), index_title->details->title, 0, 0, 0);
gtk_box_reorder_child (GTK_BOX (index_title), index_title->details->title, 1);