Mercurial > hg > forks > geeqie
changeset 2533:cb7618555fe6
Add pan filtering to all of the pan view modes
| author | Omari Stephens <xsdg@google.com> |
|---|---|
| date | Thu, 29 Dec 2016 09:58:59 +0000 |
| parents | a8680578677a |
| children | 0b95ae9541e9 |
| files | src/pan-view/pan-calendar.c src/pan-view/pan-folder.c src/pan-view/pan-grid.c src/pan-view/pan-timeline.c |
| diffstat | 4 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pan-view/pan-calendar.c Tue Dec 27 20:35:59 2016 +0000 +++ b/src/pan-view/pan-calendar.c Thu Dec 29 09:58:59 2016 +0000 @@ -26,6 +26,7 @@ #include "pan-util.h" #include "pan-view.h" +#include "pan-view-filter.h" #include "pixbuf_util.h" #define PAN_CAL_POPUP_COLOR 220, 220, 220 @@ -200,6 +201,7 @@ gint end_month = 0; list = pan_list_tree(dir_fd, SORT_NONE, TRUE, pw->ignore_symlinks); + pan_filter_fd_list(&list, pw->filter_ui->filter_elements); if (pw->cache_list && pw->exif_date_enable) {
--- a/src/pan-view/pan-folder.c Tue Dec 27 20:35:59 2016 +0000 +++ b/src/pan-view/pan-folder.c Thu Dec 29 09:58:59 2016 +0000 @@ -25,6 +25,7 @@ #include "pan-item.h" #include "pan-util.h" +#include "pan-view-filter.h" static void pan_flower_size(PanWindow *pw, gint *width, gint *height) { @@ -242,6 +243,8 @@ f = filelist_sort(f, SORT_NAME, TRUE); d = filelist_sort(d, SORT_NAME, TRUE); + pan_filter_fd_list(&f, pw->filter_ui->filter_elements); + pi_box = pan_item_text_new(pw, x, y, dir_fd->path, PAN_TEXT_ATTR_NONE, PAN_TEXT_BORDER_SIZE, PAN_TEXT_COLOR, 255); @@ -386,6 +389,8 @@ f = filelist_sort(f, SORT_NAME, TRUE); d = filelist_sort(d, SORT_NAME, TRUE); + pan_filter_fd_list(&f, pw->filter_ui->filter_elements); + *x = PAN_BOX_BORDER + ((*level) * MAX(PAN_BOX_BORDER, PAN_THUMB_GAP)); pi_box = pan_item_text_new(pw, *x, *y, dir_fd->path, PAN_TEXT_ATTR_NONE,
--- a/src/pan-view/pan-grid.c Tue Dec 27 20:35:59 2016 +0000 +++ b/src/pan-view/pan-grid.c Thu Dec 29 09:58:59 2016 +0000 @@ -25,6 +25,7 @@ #include "pan-item.h" #include "pan-util.h" +#include "pan-view-filter.h" void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height) { @@ -35,6 +36,7 @@ gint next_y; list = pan_list_tree(dir_fd, SORT_NAME, TRUE, pw->ignore_symlinks); + pan_filter_fd_list(&list, pw->filter_ui->filter_elements); grid_size = (gint)sqrt((gdouble)g_list_length(list)); if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE)
--- a/src/pan-view/pan-timeline.c Tue Dec 27 20:35:59 2016 +0000 +++ b/src/pan-view/pan-timeline.c Thu Dec 29 09:58:59 2016 +0000 @@ -42,7 +42,7 @@ gint y_height; list = pan_list_tree(dir_fd, SORT_NONE, TRUE, pw->ignore_symlinks); - gboolean changed = pan_filter_fd_list(&list, pw->filter_ui->filter_elements); + pan_filter_fd_list(&list, pw->filter_ui->filter_elements); if (pw->cache_list && pw->exif_date_enable) {