diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 16:48:02 +0100 |
commit | abdaad68fb94e2d61448a6dfc14847df8a2c32b9 (patch) | |
tree | 26855c5dd3bfffdbf319d5ba4a38223a28de3e7c /src/SearchFilter.vala | |
parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
parent | dd7f98a232efe86f6e6055119c9414a0f9d9e67b (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/SearchFilter.vala')
-rw-r--r-- | src/SearchFilter.vala | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala index 04e5593..fba5488 100644 --- a/src/SearchFilter.vala +++ b/src/SearchFilter.vala @@ -204,12 +204,8 @@ public abstract class DefaultSearchViewFilter : SearchViewFilter { } else if (source is Photo) { Photo photo = source as Photo; if (photo.get_master_file_format() == PhotoFileFormat.RAW) { - if (photo.is_raw_developer_available(RawDeveloper.CAMERA)) { - if (!show_media_photos && !show_media_raw) - return false; - } else if (!show_media_raw) { + if (!show_media_photos && !show_media_raw) return false; - } } else if (!show_media_photos) return false; } @@ -1170,7 +1166,9 @@ public class SearchFilterToolbar : Gtk.Revealer { private void on_media_context_changed(bool has_photos, bool has_videos, bool has_raw, bool has_flagged) { - if (has_photos) + if (has_photos || has_raw) + // As a user, I would expect, that a raw photo is still a photo. + // Let's enable the photo button even if there ar only raw photos. toolbtn_photos.set_icon_name(Resources.ICON_FILTER_PHOTOS); else toolbtn_photos.set_icon_name(Resources.ICON_FILTER_PHOTOS_DISABLED); @@ -1391,4 +1389,3 @@ public class SearchFilterToolbar : Gtk.Revealer { search_box.get_focus(); } } - |