Mercurial > geeqie
comparison src/collect-table.c @ 333:767b53cd9ab7
Rename thumbnails related options.
author | zas_ |
---|---|
date | Sat, 12 Apr 2008 09:41:44 +0000 |
parents | 57a4ced53618 |
children | 4b2d7f9af171 |
comparison
equal
deleted
inserted
replaced
332:3c4bad726e98 | 333:767b53cd9ab7 |
---|---|
203 | 203 |
204 static gint collection_table_get_icon_width(CollectTable *ct) | 204 static gint collection_table_get_icon_width(CollectTable *ct) |
205 { | 205 { |
206 gint width; | 206 gint width; |
207 | 207 |
208 if (!ct->show_text) return options->thumb_max_width; | 208 if (!ct->show_text) return options->thumbnails.max_width; |
209 | 209 |
210 width = options->thumb_max_width + options->thumb_max_width / 2; | 210 width = options->thumbnails.max_width + options->thumbnails.max_width / 2; |
211 if (width < THUMB_MIN_ICON_WIDTH) width = THUMB_MIN_ICON_WIDTH; | 211 if (width < THUMB_MIN_ICON_WIDTH) width = THUMB_MIN_ICON_WIDTH; |
212 if (width > THUMB_MAX_ICON_WIDTH) width = options->thumb_max_width; | 212 if (width > THUMB_MAX_ICON_WIDTH) width = options->thumbnails.max_width; |
213 | 213 |
214 return width; | 214 return width; |
215 } | 215 } |
216 | 216 |
217 /* | 217 /* |
986 gint ret; | 986 gint ret; |
987 | 987 |
988 adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ct->listview)); | 988 adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ct->listview)); |
989 page_size = (gint)adj->page_increment; | 989 page_size = (gint)adj->page_increment; |
990 | 990 |
991 row_height = options->thumb_max_height + THUMB_BORDER_PADDING * 2; | 991 row_height = options->thumbnails.max_height + THUMB_BORDER_PADDING * 2; |
992 if (ct->show_text) row_height += options->thumb_max_height / 3; | 992 if (ct->show_text) row_height += options->thumbnails.max_height / 3; |
993 | 993 |
994 ret = page_size / row_height; | 994 ret = page_size / row_height; |
995 if (ret < 1) ret = 1; | 995 if (ret < 1) ret = 1; |
996 | 996 |
997 return ret; | 997 return ret; |
1390 collection_table_insert_marker(ct, NULL, FALSE); | 1390 collection_table_insert_marker(ct, NULL, FALSE); |
1391 } | 1391 } |
1392 else | 1392 else |
1393 { | 1393 { |
1394 GtkAdjustment *adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ct->listview)); | 1394 GtkAdjustment *adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ct->listview)); |
1395 widget_auto_scroll_start(ct->listview, adj, -1, options->thumb_max_height / 2, | 1395 widget_auto_scroll_start(ct->listview, adj, -1, options->thumbnails.max_height / 2, |
1396 collection_table_auto_scroll_notify_cb, ct); | 1396 collection_table_auto_scroll_notify_cb, ct); |
1397 } | 1397 } |
1398 } | 1398 } |
1399 | 1399 |
1400 /* | 1400 /* |
1592 g_list_free(list); | 1592 g_list_free(list); |
1593 | 1593 |
1594 if (cell && GQV_IS_CELL_RENDERER_ICON(cell)) | 1594 if (cell && GQV_IS_CELL_RENDERER_ICON(cell)) |
1595 { | 1595 { |
1596 g_object_set(G_OBJECT(cell), "fixed_width", thumb_width, | 1596 g_object_set(G_OBJECT(cell), "fixed_width", thumb_width, |
1597 "fixed_height", options->thumb_max_height, | 1597 "fixed_height", options->thumbnails.max_height, |
1598 "show_text", ct->show_text, NULL); | 1598 "show_text", ct->show_text, NULL); |
1599 } | 1599 } |
1600 } | 1600 } |
1601 if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview)); | 1601 if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview)); |
1602 } | 1602 } |