commit d830d42a9c9cca7b629ba13fe743c2083cb140e3 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Sun Apr 13 20:59:40 2014 +0200
- rel 7; timeline zoom fix from upstream openshot-r741.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ openshot.spec | 4 +++- 2 files changed, 46 insertions(+), 1 deletion(-) --- diff --git a/openshot.spec b/openshot.spec index e0ee969..1e0f738 100644 --- a/openshot.spec +++ b/openshot.spec @@ -1,13 +1,14 @@ Summary: OpenShot - Non-Linear Video Editor for Linux Name: openshot Version: 1.4.3 -Release: 6 +Release: 7 License: GPL v3 Group: X11/Applications Source0: http://launchpad.net/openshot/1.4/%{version}/+download/%{name}-%{version}.tar.gz # Source0-md5: 5ec82a7e8b7700ee4a359458aedf19e9 Patch0: %{name}-locale_dir.patch Patch1: openshot-bug-722285.patch +Patch2: openshot-r741.patch URL: http://www.openshot.org/ BuildRequires: python-devel BuildRequires: rpm-pythonprov @@ -39,6 +40,7 @@ Features include: %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p0 %build %{__python} setup.py build diff --git a/openshot-r741.patch b/openshot-r741.patch new file mode 100644 index 0000000..7073611 --- /dev/null +++ b/openshot-r741.patch @@ -0,0 +1,43 @@ +=== modified file 'openshot/classes/sequences.py' +--- openshot/classes/sequences.py 2012-09-07 20:37:38 +0000 ++++ openshot/classes/sequences.py 2013-08-20 20:42:30 +0000 +@@ -152,6 +152,12 @@ + + def Render(self): + ++ # Disable window redraws temporarily (prevents flicker) ++ self.project.form.MyCanvas_Left.window.freeze_updates() ++ self.project.form.TimelineCanvas_Left.window.freeze_updates() ++ self.project.form.MyCanvas.window.freeze_updates() ++ self.project.form.TimelineCanvas_Right.window.freeze_updates() ++ + # Clear the canvases + self.project.form.MyCanvas_Left.set_root_item(goocanvas.Group()) + self.project.form.TimelineCanvas_Left.set_root_item(goocanvas.Group()) +@@ -180,7 +186,11 @@ + # Render track + MyTran.Render() + +- ++ # Enable window redraws again ++ self.project.form.MyCanvas_Left.window.thaw_updates() ++ self.project.form.TimelineCanvas_Left.window.thaw_updates() ++ self.project.form.MyCanvas.window.thaw_updates() ++ self.project.form.TimelineCanvas_Right.window.thaw_updates() + + def GenerateXML(self, dom, xmlParentNode): + + +=== modified file 'openshot/windows/ui/Main.ui' +--- openshot/windows/ui/Main.ui 2012-04-29 21:18:25 +0000 ++++ openshot/windows/ui/Main.ui 2013-08-20 20:42:30 +0000 +@@ -1514,7 +1514,7 @@ + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Slide to Zoom</property> +- <property name="update_policy">delayed</property> ++ <property name="update_policy">continuous</property> + <property name="adjustment">adjustment3</property> + <property name="draw_value">False</property> + <signal name="change-value" handler="on_hsZoom_change_value" swapped="no"/> + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/openshot.git/commitdiff/d830d42a9c9cca7b629ba13fe743c2083cb140e3 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit