From 42b63cc27471d5728ba81b6bf4200deddad8ab04 Mon Sep 17 00:00:00 2001
From: Curtis Gedak <gedakc@src.gnome.org>
Date: Mon, 16 Feb 2009 19:53:43 +0000
Subject: [PATCH] Enhanced move/resize functionality - Only move start sector
 if dialog space before value is changed.

svn path=/trunk/; revision=1070
---
 ChangeLog                    |  5 +++++
 src/Dialog_Base_Partition.cc |  6 +++++-
 src/GParted_Core.cc          | 33 ++++++++++++++++++++-------------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 866e9b7d..57de2e94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-02-16  Curtis Gedak  <gedakc@gmail.com>
 
+	* src/Dialog_Base_Partition.cc,
+	  src/GParted_Core.cc: Enhanced move/resize functionality.
+	  - Only move start sector if dialog space before value is changed.
+	  - Closes GParted bug #571151
+
 	* include/Partition.h,
 	  src/Partition.cc: Added strict_start indicator.
 
diff --git a/src/Dialog_Base_Partition.cc b/src/Dialog_Base_Partition.cc
index 06c25936..95acd844 100644
--- a/src/Dialog_Base_Partition.cc
+++ b/src/Dialog_Base_Partition.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005, 2006, 2007, 2008 Bart Hakvoort
+/* Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Bart Hakvoort
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -152,6 +152,10 @@ Partition Dialog_Base_Partition::Get_New_Partition()
 	//set indicator of whether to use strict sector values, or to round to cylinders
 	selected_partition .strict = ! checkbutton_round_to_cylinders .get_active() ;
 
+	//if the original before value has not changed, then set indicator to keep start sector unchanged
+	if ( ORIG_BEFORE == spinbutton_before .get_value_as_int() )
+		selected_partition .strict_start = TRUE ;
+
 	return selected_partition ;
 }
 
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index ca21990c..3d1e92db 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -314,7 +314,7 @@ bool GParted_Core::snap_to_cylinder( const Device & device, Partition & partitio
 		} else {
 			diff = partition .sector_start % device .cylsize ;
 		}
-		if ( diff )
+		if ( diff && ! partition .strict_start  )
 		{
 			if ( diff < ( device .cylsize / 2 ) )
 				partition .sector_start -= diff ;
@@ -1242,7 +1242,10 @@ bool GParted_Core::resize_move( const Device & device,
 			  	Partition & partition_new,
 			  	OperationDetail & operationdetail ) 
 {
-	if ( partition_new .strict || calculate_exact_geom( partition_old, partition_new, operationdetail ) )
+	if (   partition_new .strict
+		|| partition_new .strict_start
+		|| calculate_exact_geom( partition_old, partition_new, operationdetail )
+	   )
 	{
 		if ( partition_old .type == TYPE_EXTENDED )
 			return resize_move_partition( partition_old, partition_new, operationdetail ) ;
@@ -1299,8 +1302,8 @@ bool GParted_Core::move( const Device & device,
 		//(maybe i should do some reading on how non-msdos disklabels deal with metadata....)
 		if ( partition_new .sector_start < partition_old .sector_start )
 		{
-	       		if ( resize_move_partition( partition_old, partition_new, operationdetail ) )
-	       	   	{
+			if ( resize_move_partition( partition_old, partition_new, operationdetail ) )
+			{
 				if ( ! move_filesystem( partition_old, partition_new, operationdetail ) )
 				{
 					operationdetail .add_child( OperationDetail( _("rollback last change to the partition table") ) ) ;
@@ -1315,13 +1318,13 @@ bool GParted_Core::move( const Device & device,
 			}
 		}
 		else
-	       		succes = move_filesystem( partition_old, partition_new, operationdetail ) &&
-	       			 resize_move_partition( partition_old, partition_new, operationdetail ) ;
+			succes = move_filesystem( partition_old, partition_new, operationdetail ) &&
+				resize_move_partition( partition_old, partition_new, operationdetail ) ;
 
 		succes = succes &&
-			 update_bootsector( partition_new, operationdetail ) &&
-	       		 check_repair_filesystem( partition_new, operationdetail ) &&
-	       		 maximize_filesystem( partition_new, operationdetail ) ;
+			update_bootsector( partition_new, operationdetail ) &&
+			check_repair_filesystem( partition_new, operationdetail ) &&
+			maximize_filesystem( partition_new, operationdetail ) ;
 	}
 
 	return succes ;
@@ -1581,10 +1584,14 @@ bool GParted_Core::resize_move_partition( const Partition & partition_old,
 		
 		if ( lp_partition )
 		{
-			PedGeometry *geom = ped_geometry_new( lp_device,
-							      partition_new .sector_start,
-							      partition_new .get_length() ) ;
-			constraint = ped_constraint_exact( geom ) ;
+			if ( partition_new .strict || partition_new .strict_start ) {
+				PedGeometry *geom = ped_geometry_new( lp_device,
+									  partition_new .sector_start,
+									  partition_new .get_length() ) ;
+				constraint = ped_constraint_exact( geom ) ;
+			}
+			else
+				constraint = ped_constraint_any( lp_device ) ;
 
 			if ( constraint )
 			{