[Pkg-cli-apps-commits] [SCM] f-spot branch, master, updated. debian/0.6.1.5-3-14-g486a410

[Iain Lane]

The following commit has been merged in the master branch:
commit 735b2aa32211cfbb3dacaeb3998ef19330fcf6f4
Author: Iain Lane <laney at ubuntu.com>
Date:   Wed May 19 15:51:23 2010 +0100

    Cherrypick transition patch
    
    * debian/patches/git_transition_duration.patch: Cherrypick patch from
      upstream to reduce the transition duration when entering fullscreen to
      600ms.

diff --git a/debian/changelog b/debian/changelog
index 8f466ad..d49da04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ f-spot (0.6.2-1) UNRELEASED; urgency=low
     --view mode and add an undo/redo stack. Rebase on new upstream version.
     Thanks to Chris Halse Rogers.
   * debian/patches/ubuntu_fname_quote_percent.patch: Drop, now upstream.
+  * debian/patches/git_transition_duration.patch: Cherrypick patch from
+    upstream to reduce the transition duration when entering fullscreen to
+    600ms. 
   * debian/rules: Incorporate Ubuntu specific changes, and guard by a call to
     dpkg-vendor.
 
diff --git a/debian/patches/git_transition_duration.patch b/debian/patches/git_transition_duration.patch
new file mode 100644
index 0000000..c871049
--- /dev/null
+++ b/debian/patches/git_transition_duration.patch
@@ -0,0 +1,43 @@
+From 0d705371f388410d62172e1413c060d8629ac0f6 Mon Sep 17 00:00:00 2001
+From: Iain Lane <laney at ubuntu.com>
+Date: Tue, 09 Mar 2010 19:36:20 +0000
+Subject: Fix for bgo#608216
+
+src/Fader.cs: Change the constructor for the fader to accept a double
+              representing the number of milliseconds to fade for,
+			  instead of the number of seconds.
+
+src/FullScreenView.cs: Change the timeout for entering full screen view to 600ms.
+---
+Index: f-spot.git/src/Fader.cs
+===================================================================
+--- f-spot.git.orig/src/Fader.cs	2010-05-19 15:18:08.036710007 +0100
++++ f-spot.git/src/Fader.cs	2010-05-19 15:49:45.186710570 +0100
+@@ -21,12 +21,12 @@
+ 		double target_opacity;
+ 		DoubleAnimation fadin;
+ 
+-		public Fader (Gtk.Window win, double target, int sec)
++		public Fader (Gtk.Window win, double target, double msec)
+ 		{
+ 			this.win = win;
+ 			win.Mapped += HandleMapped;
+ 			win.Unmapped += HandleUnmapped;
+-			fadin = new DoubleAnimation (0.0, target, new TimeSpan (0, 0, sec), delegate (double opacity) {
++			fadin = new DoubleAnimation (0.0, target, TimeSpan.FromMilliseconds(msec), delegate (double opacity) {
+ 				CompositeUtils.SetWinOpacity (win, opacity);
+ 			});	
+ 		}
+Index: f-spot.git/src/FullScreenView.cs
+===================================================================
+--- f-spot.git.orig/src/FullScreenView.cs	2010-05-19 15:18:08.056710820 +0100
++++ f-spot.git/src/FullScreenView.cs	2010-05-19 15:49:45.186710570 +0100
+@@ -85,7 +85,7 @@
+ 				slide_show.Activated += SlideShowAction;
+ 				actions.Add (slide_show);
+ 
+-				new Fader (this, 1.0, 3);
++				new Fader (this, 1.0, 600);
+ 				notebook = new Notebook ();
+ 				notebook.ShowBorder = false;
+ 				notebook.ShowTabs = false;
diff --git a/debian/patches/series b/debian/patches/series
index 87364b2..58326dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ ubuntu_handle_broken_uris_to_view_mode.patch
 
 ubuntu_default_view_size.patch
 ubuntu_fix_folder_export_hang.patch
+git_transition_duration.patch

-- 
f-spot