diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/SearchFilter.vala | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/SearchFilter.vala')
| -rw-r--r-- | src/SearchFilter.vala | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala index e4c1512..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; } @@ -859,7 +855,7 @@ public class SearchFilterToolbar : Gtk.Revealer { button = new Gtk.ToggleButton(); button.set_always_show_image(true); - Gtk.Image? image = new Gtk.Image.from_icon_name("find", Gtk.IconSize.SMALL_TOOLBAR); + Gtk.Image? image = new Gtk.Image.from_icon_name("edit-find", Gtk.IconSize.SMALL_TOOLBAR); image.set_margin_end(6); button.set_image(image); button.set_can_focus(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(); } } - |