File 0001-Remove-photo-from-the-collection-when-dele... of Package shotwell.1055

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch of Package shotwell.1055 (Revision 1085daacb2295c369d7a1d76664533eb)

Currently displaying revision 1085daacb2295c369d7a1d76664533eb , Show latest

From 0ee62bcc4194ce1383bdac7f4d7ebeeafe3d39b0 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@suse.com>
Date: Tue, 22 Jul 2014 15:38:39 -0500
Subject: [PATCH] Remove photo from the collection when deleting in single-page
 view

https://bugzilla.gnome.org/show_bug.cgi?id=732964
---
 src/PhotoPage.vala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 50f0c1a..b91e939 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -1358,7 +1358,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
     
     protected override bool on_shift_pressed(Gdk.EventKey? event) {
         // show quick compare of original only if no tool is in use, the original pixbuf is handy
-        if (current_tool == null && !get_ctrl_pressed() && !get_alt_pressed())
+        if (current_tool == null && !get_ctrl_pressed() && !get_alt_pressed() && has_photo())
             swap_in_original();
         
         return base.on_shift_pressed(event);
@@ -3144,6 +3144,9 @@ public class LibraryPhotoPage : EditingHostPage {
         
         // move on to the next one in the collection
         on_next_photo();
+
+        ViewCollection view = get_view();
+        view.remove_marked(view.mark(view.get_view_for_source(photo)));
         if (photo.equals(get_photo())) {
             // this indicates there is only one photo in the controller, or now zero, so switch 
             // to the Photos page, which is guaranteed to be there
-- 
1.8.4

Places

File 0001-Remove-photo-from-the-collection-when-deleting-in-si.patch of Package shotwell.1055 (Revision 1085daacb2295c369d7a1d76664533eb)

Places