Browse Source

Fix bugs

-Invert Row lengths that appears in left GridRailAdorner
-Update code which caused Row/Column lengths to be displayed at wrong positions after creation of new RowDefinition/ColumnDefinition. 


git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5838 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Kumar Devvrat 16 years ago
parent
commit
868f37138b
  1. 11
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridAdorner.cs

11
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/GridAdorner.cs

@ -127,10 +127,10 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
if (gridItem.Services.Selection.IsComponentSelected(rowItem)) { if (gridItem.Services.Selection.IsComponentSelected(rowItem)) {
drawingContext.DrawRectangle(selBrush, null, selRect); drawingContext.DrawRectangle(selBrush, null, selRect);
} }
drawingContext.PushTransform(new RotateTransform(-270)); drawingContext.PushTransform(new RotateTransform(-90));
drawingContext.PushTransform(new TranslateTransform(0, -10)); //drawingContext.PushTransform(new TranslateTransform(0, -10));
drawingContext.DrawText(text, new Point(row.Offset + row.ActualHeight / 2, 0)); drawingContext.DrawText(text, new Point((row.Offset + row.ActualHeight / 2)*-1, 0));
drawingContext.Pop(); //drawingContext.Pop();
drawingContext.Pop(); drawingContext.Pop();
} }
} }
@ -285,7 +285,9 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
newRowDefinition.Properties[RowDefinition.HeightProperty].SetValue(newLength2); newRowDefinition.Properties[RowDefinition.HeightProperty].SetValue(newLength2);
FixIndicesAfterSplit(i, Grid.RowProperty, Grid.RowSpanProperty); FixIndicesAfterSplit(i, Grid.RowProperty, Grid.RowSpanProperty);
grid.UpdateLayout();
changeGroup.Commit(); changeGroup.Commit();
gridItem.Services.Selection.SetSelectedComponents(new DesignItem[] { newRowDefinition }, SelectionTypes.Auto); gridItem.Services.Selection.SetSelectedComponents(new DesignItem[] { newRowDefinition }, SelectionTypes.Auto);
break; break;
} }
@ -340,6 +342,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
columnCollection.CollectionElements[i].Properties[ColumnDefinition.WidthProperty].SetValue(newLength1); columnCollection.CollectionElements[i].Properties[ColumnDefinition.WidthProperty].SetValue(newLength1);
newColumnDefinition.Properties[ColumnDefinition.WidthProperty].SetValue(newLength2); newColumnDefinition.Properties[ColumnDefinition.WidthProperty].SetValue(newLength2);
FixIndicesAfterSplit(i, Grid.ColumnProperty, Grid.ColumnSpanProperty); FixIndicesAfterSplit(i, Grid.ColumnProperty, Grid.ColumnSpanProperty);
grid.UpdateLayout();
changeGroup.Commit(); changeGroup.Commit();
gridItem.Services.Selection.SetSelectedComponents(new DesignItem[] { newColumnDefinition }, SelectionTypes.Auto); gridItem.Services.Selection.SetSelectedComponents(new DesignItem[] { newColumnDefinition }, SelectionTypes.Auto);
break; break;

Loading…
Cancel
Save