Browse Source

SD-1685 rect selections - closed

pull/289/head
Patryk Mikos 12 years ago
parent
commit
e65a5f8deb
  1. 2
      data/resources/StringResources.resx
  2. 6
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
  3. 6
      src/Main/SharpDevelop/Workbench/StatusBarService.cs

2
data/resources/StringResources.resx

@ -6942,7 +6942,7 @@ The resources files have been renamed/moved accordingly.</value>
<value>len ${Lenght}</value> <value>len ${Lenght}</value>
</data> </data>
<data name="StatusBarService.SelectionStatusBarPanelTextMulti" xml:space="preserve"> <data name="StatusBarService.SelectionStatusBarPanelTextMulti" xml:space="preserve">
<value>len ${Rows} * ${Cols} (${Total})$</value> <value>len ${Rows} * ${Cols} (${Total})</value>
</data> </data>
<data name="Templates.File.Categories.Misc" xml:space="preserve"> <data name="Templates.File.Categories.Misc" xml:space="preserve">
<value>Misc</value> <value>Misc</value>

6
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs

@ -399,8 +399,14 @@ namespace ICSharpCode.AvalonEdit.AddIn
return; return;
Selection selection = textArea.Selection; Selection selection = textArea.Selection;
if (selection is RectangleSelection) {
int rows = Math.Abs(selection.EndPosition.Line - selection.StartPosition.Line) + 1;
int cols = Math.Abs(selection.EndPosition.VisualColumn - selection.StartPosition.VisualColumn);
SD.StatusBar.SetSelectionMulti(rows, cols);
} else {
SD.StatusBar.SetSelectionSingle(selection.Length); SD.StatusBar.SetSelectionSingle(selection.Length);
} }
}
public INavigationPoint BuildNavPoint() public INavigationPoint BuildNavPoint()
{ {

6
src/Main/SharpDevelop/Workbench/StatusBarService.cs

@ -58,9 +58,9 @@ namespace ICSharpCode.SharpDevelop.Workbench
if (rows > 0 && cols > 0) { if (rows > 0 && cols > 0) {
statusBar.SelectionStatusBarPanel.Content = StringParser.Parse( statusBar.SelectionStatusBarPanel.Content = StringParser.Parse(
"${res:StatusBarService.SelectionStatusBarPanelTextMulti}", "${res:StatusBarService.SelectionStatusBarPanelTextMulti}",
new StringTagPair("Rows", String.Format("{0,-10}", rows)), new StringTagPair("Rows", String.Format("{0}", rows)),
new StringTagPair("Cols", String.Format("{0,-10}", cols)), new StringTagPair("Cols", String.Format("{0}", cols)),
new StringTagPair("Total", String.Format("{0,-10}", rows * cols))); new StringTagPair("Total", String.Format("{0}", rows * cols)));
} else { } else {
statusBar.SelectionStatusBarPanel.Content = null; statusBar.SelectionStatusBarPanel.Content = null;
} }

Loading…
Cancel
Save