Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > dc7064db579811bd92a830eaa108ae7f > files > 2

docky-2.0.12-1.fc14.src.rpm

diff -uNr docky-2.0.7-orig/Docky/Docky/Interface/DockPreferences.cs docky-2.0.7/Docky/Docky/Interface/DockPreferences.cs
--- docky-2.0.7-orig/Docky/Docky/Interface/DockPreferences.cs	2010-08-24 20:00:47.446278995 +0200
+++ docky-2.0.7/Docky/Docky/Interface/DockPreferences.cs	2010-11-11 08:32:33.885838852 +0100
@@ -204,9 +204,7 @@
 		bool? zoom_enabled;
 		public bool ZoomEnabled {
 			get {
-				if (!zoom_enabled.HasValue)
-					zoom_enabled = GetOption<bool?> ("ZoomEnabled", true);
-				return zoom_enabled.Value; 
+				return false;
 			}
 			set {
 				if (zoom_enabled == value)
@@ -347,6 +345,8 @@
 			zoom_checkbutton.Toggled += ZoomCheckbuttonToggled;
 			autohide_box.Changed += AutohideBoxChanged;
 			fade_on_hide_check.Toggled += FadeOnHideToggled;
+
+			zoom_checkbutton.Active = false;
 			
 			DefaultProvider.ItemsChanged += HandleDefaultProviderItemsChanged;
 			
diff -uNr docky-2.0.7-orig/Docky/Docky/Interface/DockWindow.cs docky-2.0.7/Docky/Docky/Interface/DockWindow.cs
--- docky-2.0.7-orig/Docky/Docky/Interface/DockWindow.cs	2010-10-01 09:00:03.733783001 +0200
+++ docky-2.0.7/Docky/Docky/Interface/DockWindow.cs	2010-11-11 08:15:05.463742691 +0100
@@ -1759,28 +1759,8 @@
 				else
 					centerPosition += offset;
 				
-				if (!adi.Zoom) {
 					val.Zoom = 1;
 					val.Center = new Cairo.PointD ((int) centerPosition, center.Y);
-				} else {
-					// zoom is calculated as 1 through target_zoom (default 2).  
-					// The larger your offset, the smaller your zoom
-					
-					// First we get the point on our curve that defines our current zoom
-					// offset is always going to fall on a point on the curve >= 0
-					zoom = 1 - Math.Pow (offsetPercent, 2);
-					
-					// scale this to match our zoomInPercent
-					zoom = 1 + zoom * (zoomInPercent - 1);
-					
-					double zoomedCenterHeight = DockHeightBuffer + (iconSize * zoom / 2.0);
-					
-					if (zoom == 1)
-						centerPosition = Math.Round (centerPosition);
-					
-					val.Center = new Cairo.PointD (centerPosition, zoomedCenterHeight);
-					val.Zoom = zoom;
-				}
 				
 				// now we undo our transforms to the point
 				if (VerticalDock) {