[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.19+dfsg-1-3-g22c3623

[Julian Taylor]

The following commit has been merged in the master branch:
commit 22c3623b5decf8002f8f370379f86890b2001783
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Mon Sep 17 21:19:56 2012 +0200

    enforce-minimum-window-and-slider-size.patch:
    
    Closes: #686017

diff --git a/debian/changelog b/debian/changelog
index 3deaccb..aaff63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,11 @@ keepass2 (2.19+dfsg-2) unstable; urgency=medium
 
   * fix-insecure-tempfile-use.patch:
     - create small tempfiles in user owned directory instead of /tmp
+  * enforce-minimum-window-and-slider-size.patch:
+    - Closes: #686017
   * suggest mono-dmcs needed to compile plugins
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 12 May 2012 16:36:33 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 17 Sep 2012 19:31:53 +0000
 
 keepass2 (2.19+dfsg-1) unstable; urgency=low
 
diff --git a/debian/patches/enforce-minimum-window-and-slider-size.patch b/debian/patches/enforce-minimum-window-and-slider-size.patch
new file mode 100644
index 0000000..e55b841
--- /dev/null
+++ b/debian/patches/enforce-minimum-window-and-slider-size.patch
@@ -0,0 +1,52 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Mon, 17 Sep 2012 21:15:05 +0200
+Subject: enforce minimum window and slider size
+
+Winforms crashes when the listview elements are not visible on loading.
+As the windows sizes are recalled on each start this can prevent keepass
+from opening.
+To avoid this set a minimum window and slider size so the elements are
+always visible.
+
+Applied-Upstream: 2.20
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686017
+---
+ KeePass/Forms/MainForm.cs |   18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+--- a/KeePass/Forms/MainForm.cs
++++ b/KeePass/Forms/MainForm.cs
+@@ -239,7 +239,17 @@
+ 
+ 			if((sizeX != AppDefs.InvalidWindowValue) &&
+ 				(sizeY != AppDefs.InvalidWindowValue) && bWndValid)
++			{
++				if(MonoWorkarounds.IsRequired) // Debian 686017
++				{
++					sizeX = Math.Max(250, sizeX);
++					sizeY = Math.Max(250, sizeY);
++				}
++
+ 				this.Size = new Size(sizeX, sizeY);
++			}
++			if(MonoWorkarounds.IsRequired) // Debian 686017
++				this.MinimumSize = new Size(250, 250);
+ 
+ 			Rectangle rectRestWindow = new Rectangle(wndX, wndY,
+ 				this.Size.Width, this.Size.Height);
+@@ -323,8 +333,14 @@
+ 			{
+ 				float fSplitPos = mw.SplitterHorizontalFrac;
+ 				if(fSplitPos == float.Epsilon) fSplitPos = 0.8333f;
+-				m_splitHorizontal.SplitterDistance = (int)Math.Round(fSplitPos *
++				// m_splitHorizontal.SplitterDistance = (int)Math.Round(fSplitPos *
++				//	(double)m_splitHorizontal.Height);
++				int iSplitDist = (int)Math.Round(fSplitPos *
+ 					(double)m_splitHorizontal.Height);
++				if(MonoWorkarounds.IsRequired) // Debian 686017
++					m_splitHorizontal.SplitterDistance = Math.Max(35, iSplitDist);
++				else
++					m_splitHorizontal.SplitterDistance = iSplitDist;
+ 
+ 				fSplitPos = mw.SplitterVerticalFrac;
+ 				if(fSplitPos == float.Epsilon) fSplitPos = 0.25f;
diff --git a/debian/patches/series b/debian/patches/series
index 8ab2be8..7ae270e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ enable-local-help.patch
 work-around-issues-with-autotype-and-keyboard-layout.patch
 disable-autoupdate-dialog.patch
 fix-insecure-tempfile-use.patch
+enforce-minimum-window-and-slider-size.patch

-- 
keepass2