pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rename RegisterFixNamespaces to RegisterDesignerNamespaces 

Rename ChoosedItem to ChosenItem
Rename ChoosedItemChanged to ChosenItemChanged
pull/331/head
Siegfried Pammer 12 years ago
parent
d0ba91c540
commit
7448c62812
9 changed files with 68 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs
  2. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs
  3. 33
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs
  4. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs
  5. 8
      src/Main/Base/Project/Src/Commands/SideBarCommands.cs
  6. 4
      src/Main/Base/Project/Src/Gui/Components/SideBar/TextEditorSideBar.cs
  7. 44
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs
  8. 30
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs
  9. 4
      src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs

4
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs
Unescape View File

@ -39,7 +39,7 @@ namespace ICSharpCode.FormsDesigner.Gui
this.CanSaved = false; this.CanSaved = false;
AddDefaultItem(); AddDefaultItem();
this.ChoosedItemChanged += SelectedTabItemChanged; this.ChosenItemChanged += SelectedTabItemChanged;
} }
protected void AddDefaultItem() protected void AddDefaultItem()
@ -66,7 +66,7 @@ namespace ICSharpCode.FormsDesigner.Gui
void SelectedTabItemChanged(object sender, EventArgs e) void SelectedTabItemChanged(object sender, EventArgs e)
{ {
SideTabItem item = (sender as SideTab).ChoosedItem; SideTabItem item = (sender as SideTab).ChosenItem;
if (item == null) { if (item == null) {
toolboxService.SetSelectedToolboxItem(null); toolboxService.SetSelectedToolboxItem(null);
} else { } else {

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs
Unescape View File

@ -172,7 +172,7 @@ namespace ICSharpCode.FormsDesigner
} }
if (tab.Items.Count > 0) { if (tab.Items.Count > 0) {
tab.ChoosedItem = tab.Items[0]; tab.ChosenItem = tab.Items[0];
} }
sideBar.Refresh(); sideBar.Refresh();
} }

33
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfToolbox.cs
Unescape View File

@ -26,6 +26,7 @@ using System.Linq;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Designer;
using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Project;
@ -61,7 +62,7 @@ namespace ICSharpCode.WpfDesign.AddIn
SideTab sideTab = new SideTab(sideBar, "Windows Presentation Foundation"); SideTab sideTab = new SideTab(sideBar, "Windows Presentation Foundation");
sideTab.DisplayName = StringParser.Parse(sideTab.Name); sideTab.DisplayName = StringParser.Parse(sideTab.Name);
sideTab.CanBeDeleted = false; sideTab.CanBeDeleted = false;
sideTab.ChoosedItemChanged += OnChoosedItemChanged; sideTab.ChosenItemChanged += OnChosenItemChanged;
sideTab.Items.Add(new WpfSideTabItem()); sideTab.Items.Add(new WpfSideTabItem());
foreach (Type t in Metadata.GetPopularControls()) foreach (Type t in Metadata.GetPopularControls())
@ -76,14 +77,16 @@ namespace ICSharpCode.WpfDesign.AddIn
return !t.IsAbstract && !t.IsGenericTypeDefinition && t.IsSubclassOf(typeof(FrameworkElement)); return !t.IsAbstract && !t.IsGenericTypeDefinition && t.IsSubclassOf(typeof(FrameworkElement));
} }
static HashSet<string> addedAssemblys = new HashSet<string>(); static readonly HashSet<string> addedAssemblies = new HashSet<string>();
public void AddProjectDlls(OpenedFile file) public void AddProjectDlls(OpenedFile file)
{ {
var compilation = SD.ParserService.GetCompilationForFile(file.FileName); var compilation = SD.ParserService.GetCompilationForFile(file.FileName);
var typeResolutionService = new TypeResolutionService(file.FileName);
foreach (var reference in compilation.ReferencedAssemblies) { foreach (var reference in compilation.ReferencedAssemblies) {
string f = reference.GetReferenceAssemblyLocation(); string assemblyFileName = reference.GetReferenceAssemblyLocation();
if (f != null && !addedAssemblys.Contains(f)) { if (assemblyFileName != null && !addedAssemblies.Contains(assemblyFileName)) {
try { try {
// DO NOT USE Assembly.LoadFrom!!! // DO NOT USE Assembly.LoadFrom!!!
// see http://community.sharpdevelop.net/forums/t/19968.aspx // see http://community.sharpdevelop.net/forums/t/19968.aspx
@ -110,18 +113,18 @@ namespace ICSharpCode.WpfDesign.AddIn
// //
// addedAssemblys.Add(f); // addedAssemblys.Add(f);
} catch (Exception ex) { } catch (Exception ex) {
WpfViewContent.DllLoadErrors.Add(new SDTask(new BuildError(f, ex.Message))); WpfViewContent.DllLoadErrors.Add(new SDTask(new BuildError(assemblyFileName, ex.Message)));
} }
} }
} }
} }
void OnChoosedItemChanged(object sender, EventArgs e) void OnChosenItemChanged(object sender, EventArgs e)
{ {
if (toolService != null) { if (toolService != null) {
ITool newTool = null; ITool newTool = null;
if (sideBar.ActiveTab != null && sideBar.ActiveTab.ChoosedItem != null) { if (sideBar.ActiveTab != null && sideBar.ActiveTab.ChosenItem != null) {
newTool = sideBar.ActiveTab.ChoosedItem.Tag as ITool; newTool = sideBar.ActiveTab.ChosenItem.Tag as ITool;
} }
toolService.CurrentTool = newTool ?? toolService.PointerTool; toolService.CurrentTool = newTool ?? toolService.PointerTool;
} }
@ -153,13 +156,13 @@ namespace ICSharpCode.WpfDesign.AddIn
} else { } else {
tagToFind = toolService.CurrentTool; tagToFind = toolService.CurrentTool;
} }
if (sideBar.ActiveTab.ChoosedItem != null) { if (sideBar.ActiveTab.ChosenItem != null) {
if (sideBar.ActiveTab.ChoosedItem.Tag == tagToFind) if (sideBar.ActiveTab.ChosenItem.Tag == tagToFind)
return; return;
} }
foreach (SideTabItem item in sideBar.ActiveTab.Items) { foreach (SideTabItem item in sideBar.ActiveTab.Items) {
if (item.Tag == tagToFind) { if (item.Tag == tagToFind) {
sideBar.ActiveTab.ChoosedItem = item; sideBar.ActiveTab.ChosenItem = item;
sideBar.Refresh(); sideBar.Refresh();
return; return;
} }
@ -168,13 +171,13 @@ namespace ICSharpCode.WpfDesign.AddIn
foreach (SideTabItem item in tab.Items) { foreach (SideTabItem item in tab.Items) {
if (item.Tag == tagToFind) { if (item.Tag == tagToFind) {
sideBar.ActiveTab = tab; sideBar.ActiveTab = tab;
sideBar.ActiveTab.ChoosedItem = item; sideBar.ActiveTab.ChosenItem = item;
sideBar.Refresh(); sideBar.Refresh();
return; return;
} }
} }
} }
sideBar.ActiveTab.ChoosedItem = null; sideBar.ActiveTab.ChosenItem = null;
sideBar.Refresh(); sideBar.Refresh();
} }
@ -182,8 +185,8 @@ namespace ICSharpCode.WpfDesign.AddIn
{ {
protected override object StartItemDrag(SideTabItem draggedItem) protected override object StartItemDrag(SideTabItem draggedItem)
{ {
if (this.ActiveTab.ChoosedItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) { if (this.ActiveTab.ChosenItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) {
this.ActiveTab.ChoosedItem = draggedItem; this.ActiveTab.ChosenItem = draggedItem;
} }
if (draggedItem.Tag != null) { if (draggedItem.Tag != null) {

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs
Unescape View File

@ -216,7 +216,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
/// <summary> /// <summary>
/// Register the Namspaces not found in any Assembly, but used by VS and Expression Blend /// Register the Namspaces not found in any Assembly, but used by VS and Expression Blend
/// </summary> /// </summary>
public void RegisterFixNamespaces() public void RegisterDesignerNamespaces()
{ {
var ns = namespaces[XamlConstants.DesignTimeNamespace] = new XamlNamespace("d", XamlConstants.DesignTimeNamespace); var ns = namespaces[XamlConstants.DesignTimeNamespace] = new XamlNamespace("d", XamlConstants.DesignTimeNamespace);
AddMappingToNamespace(ns, new AssemblyNamespaceMapping(typeof(DesignTimeProperties).Assembly, typeof(DesignTimeProperties).Namespace)); AddMappingToNamespace(ns, new AssemblyNamespaceMapping(typeof(DesignTimeProperties).Assembly, typeof(DesignTimeProperties).Namespace));
@ -281,7 +281,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
static WpfTypeFinder() static WpfTypeFinder()
{ {
Instance = new XamlTypeFinder(); Instance = new XamlTypeFinder();
Instance.RegisterFixNamespaces(); Instance.RegisterDesignerNamespaces();
Instance.RegisterAssembly(typeof(MarkupExtension).Assembly); // WindowsBase Instance.RegisterAssembly(typeof(MarkupExtension).Assembly); // WindowsBase
Instance.RegisterAssembly(typeof(IAddChild).Assembly); // PresentationCore Instance.RegisterAssembly(typeof(IAddChild).Assembly); // PresentationCore
Instance.RegisterAssembly(typeof(XamlReader).Assembly); // PresentationFramework Instance.RegisterAssembly(typeof(XamlReader).Assembly); // PresentationFramework

8
src/Main/Base/Project/Src/Commands/SideBarCommands.cs
Unescape View File

@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Commands
public override void Run() public override void Run()
{ {
SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
SideTabItem item = sideBar.ActiveTab.ChoosedItem; SideTabItem item = sideBar.ActiveTab.ChosenItem;
if (item != null) { if (item != null) {
sideBar.StartRenamingOf(item); sideBar.StartRenamingOf(item);
} }
@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Commands
public override void Run() public override void Run()
{ {
SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
SideTabItem item = sideBar.ActiveTab.ChoosedItem; SideTabItem item = sideBar.ActiveTab.ChosenItem;
if (item != null) { if (item != null) {
if (MessageBox.Show(StringParser.Parse( if (MessageBox.Show(StringParser.Parse(
"${res:SideBarComponent.ContextMenu.DeleteTabItemQuestion}", new StringTagPair("TabItem", item.Name)), "${res:SideBarComponent.ContextMenu.DeleteTabItemQuestion}", new StringTagPair("TabItem", item.Name)),
@ -162,7 +162,7 @@ namespace ICSharpCode.SharpDevelop.Commands
public override void Run() public override void Run()
{ {
SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChoosedItem); int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChosenItem);
if (index > 0) { if (index > 0) {
sideBar.ActiveTab.Exchange(index -1, index); sideBar.ActiveTab.Exchange(index -1, index);
sideBar.Refresh(); sideBar.Refresh();
@ -175,7 +175,7 @@ namespace ICSharpCode.SharpDevelop.Commands
public override void Run() public override void Run()
{ {
SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner; SharpDevelopSideBar sideBar = (SharpDevelopSideBar)Owner;
int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChoosedItem); int index = sideBar.ActiveTab.Items.IndexOf(sideBar.ActiveTab.ChosenItem);
if (index >= 0 && index < sideBar.ActiveTab.Items.Count - 1) { if (index >= 0 && index < sideBar.ActiveTab.Items.Count - 1) {
sideBar.ActiveTab.Exchange(index, index + 1); sideBar.ActiveTab.Exchange(index, index + 1);
sideBar.Refresh(); sideBar.Refresh();

4
src/Main/Base/Project/Src/Gui/Components/SideBar/TextEditorSideBar.cs
Unescape View File

@ -223,8 +223,8 @@ namespace ICSharpCode.SharpDevelop.Gui
protected override object StartItemDrag(SideTabItem draggedItem) protected override object StartItemDrag(SideTabItem draggedItem)
{ {
if (this.ActiveTab.ChoosedItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) { if (this.ActiveTab.ChosenItem != draggedItem && this.ActiveTab.Items.Contains(draggedItem)) {
this.ActiveTab.ChoosedItem = draggedItem; this.ActiveTab.ChosenItem = draggedItem;
} }
var dataObject = new System.Windows.DataObject(); var dataObject = new System.Windows.DataObject();
dataObject.SetText(draggedItem.Tag.ToString()); dataObject.SetText(draggedItem.Tag.ToString());

44
src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideBar.cs
Unescape View File

@ -205,55 +205,55 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
switch (keyData) { switch (keyData) {
case Keys.Home: case Keys.Home:
if (activeTab.Items.Count > 0 && !isInRenameMode) { if (activeTab.Items.Count > 0 && !isInRenameMode) {
activeTab.ChoosedItem = activeTab.Items[0]; activeTab.ChosenItem = activeTab.Items[0];
EnsureVisible(activeTab.ChoosedItem); EnsureVisible(activeTab.ChosenItem);
Refresh(); Refresh();
} }
break; break;
case Keys.End: case Keys.End:
if (activeTab.Items.Count > 0 && !isInRenameMode) { if (activeTab.Items.Count > 0 && !isInRenameMode) {
activeTab.ChoosedItem = activeTab.Items[activeTab.Items.Count - 1]; activeTab.ChosenItem = activeTab.Items[activeTab.Items.Count - 1];
EnsureVisible(activeTab.ChoosedItem); EnsureVisible(activeTab.ChosenItem);
Refresh(); Refresh();
} }
break; break;
case Keys.PageUp: case Keys.PageUp:
if (activeTab.Items.Count > 0 && !isInRenameMode) { if (activeTab.Items.Count > 0 && !isInRenameMode) {
index = Math.Max(0, activeTab.Items.IndexOf(activeTab.ChoosedItem) - scrollBar.LargeChange); index = Math.Max(0, activeTab.Items.IndexOf(activeTab.ChosenItem) - scrollBar.LargeChange);
activeTab.ChoosedItem = activeTab.Items[index]; activeTab.ChosenItem = activeTab.Items[index];
EnsureVisible(activeTab.ChoosedItem); EnsureVisible(activeTab.ChosenItem);
Refresh(); Refresh();
} }
break; break;
case Keys.PageDown: case Keys.PageDown:
if (activeTab.Items.Count > 0 && !isInRenameMode) { if (activeTab.Items.Count > 0 && !isInRenameMode) {
index = Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChoosedItem) + scrollBar.LargeChange); index = Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChosenItem) + scrollBar.LargeChange);
activeTab.ChoosedItem = activeTab.Items[index]; activeTab.ChosenItem = activeTab.Items[index];
EnsureVisible(activeTab.ChoosedItem); EnsureVisible(activeTab.ChosenItem);
Refresh(); Refresh();
} }
break; break;
case Keys.Down: case Keys.Down:
if (activeTab.Items.Count > 0 && !isInRenameMode) { if (activeTab.Items.Count > 0 && !isInRenameMode) {
if (activeTab.ChoosedItem != null) { if (activeTab.ChosenItem != null) {
activeTab.ChoosedItem = activeTab.Items[Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChoosedItem) + 1)]; activeTab.ChosenItem = activeTab.Items[Math.Min(activeTab.Items.Count - 1, activeTab.Items.IndexOf(activeTab.ChosenItem) + 1)];
} else { } else {
activeTab.ChoosedItem = activeTab.Items[0]; activeTab.ChosenItem = activeTab.Items[0];
} }
activeTab.SelectedItem = null; activeTab.SelectedItem = null;
EnsureVisible(activeTab.ChoosedItem); EnsureVisible(activeTab.ChosenItem);
Refresh(); Refresh();
} }
return true; return true;
case Keys.Up: case Keys.Up:
if (activeTab.Items.Count > 0 && !isInRenameMode) { if (activeTab.Items.Count > 0 && !isInRenameMode) {
if (activeTab.ChoosedItem != null) { if (activeTab.ChosenItem != null) {
activeTab.ChoosedItem = activeTab.Items[Math.Max(0, activeTab.Items.IndexOf(activeTab.ChoosedItem) - 1)]; activeTab.ChosenItem = activeTab.Items[Math.Max(0, activeTab.Items.IndexOf(activeTab.ChosenItem) - 1)];
} else { } else {
activeTab.ChoosedItem = activeTab.Items[0]; activeTab.ChosenItem = activeTab.Items[0];
} }
activeTab.SelectedItem = null; activeTab.SelectedItem = null;
EnsureVisible(activeTab.ChoosedItem); EnsureVisible(activeTab.ChosenItem);
Refresh(); Refresh();
} }
return true; return true;
@ -328,7 +328,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
void ItemContextMenuPopup(object sender, EventArgs e) void ItemContextMenuPopup(object sender, EventArgs e)
{ {
activeTab.ChoosedItem = activeTab.SelectedItem; activeTab.ChosenItem = activeTab.SelectedItem;
Refresh(); Refresh();
} }
@ -794,7 +794,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
case DragDropEffects.Move: case DragDropEffects.Move:
SideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y); SideTabItem item = sideBar.activeTab.GetItemAt(p.X, p.Y);
if (item != sideBar.activeTab.ChoosedItem) { if (item != sideBar.activeTab.ChosenItem) {
int idx = sideBar.activeTab.Items.DraggedIndex; int idx = sideBar.activeTab.Items.DraggedIndex;
if (idx != -1) { if (idx != -1) {
sideBar.activeTab.Items.Remove(draggedItem); sideBar.activeTab.Items.Remove(draggedItem);
@ -847,7 +847,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
sideBar.ClearDraggings(sideBar.activeTab); sideBar.ClearDraggings(sideBar.activeTab);
sideBar.Refresh(); sideBar.Refresh();
} else } else
if (item != sideBar.activeTab.ChoosedItem) { if (item != sideBar.activeTab.ChosenItem) {
if (item.SideTabItemStatus != SideTabItemStatus.Drag) { if (item.SideTabItemStatus != SideTabItemStatus.Drag) {
sideBar.ClearDraggings(sideBar.activeTab); sideBar.ClearDraggings(sideBar.activeTab);
item.SideTabItemStatus = SideTabItemStatus.Drag; item.SideTabItemStatus = SideTabItemStatus.Drag;
@ -933,7 +933,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
base.OnMouseDown(e); base.OnMouseDown(e);
if (e.Button == MouseButtons.Left && sideBar.activeTab != null) { if (e.Button == MouseButtons.Left && sideBar.activeTab != null) {
mouseDownPos = e.Location; mouseDownPos = e.Location;
sideBar.activeTab.ChoosedItem = sideBar.activeTab.SelectedItem; sideBar.activeTab.ChosenItem = sideBar.activeTab.SelectedItem;
} }
Refresh(); Refresh();
} }

30
src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTab.cs
Unescape View File

@ -100,7 +100,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
SideTabItemCollection items = new SideTabItemCollection(); SideTabItemCollection items = new SideTabItemCollection();
SideTabStatus sideTabStatus; SideTabStatus sideTabStatus;
SideTabItem selectedItem = null; SideTabItem selectedItem = null;
SideTabItem choosedItem = null; SideTabItem chosenItem = null;
ImageList largeImageList = null; ImageList largeImageList = null;
ImageList smallImageList = null; ImageList smallImageList = null;
@ -209,37 +209,37 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
return selectedItem; return selectedItem;
} }
set { set {
if (selectedItem != null && selectedItem != choosedItem) { if (selectedItem != null && selectedItem != chosenItem) {
selectedItem.SideTabItemStatus = SideTabItemStatus.Normal; selectedItem.SideTabItemStatus = SideTabItemStatus.Normal;
} }
selectedItem = value; selectedItem = value;
if (selectedItem != null && selectedItem != choosedItem) { if (selectedItem != null && selectedItem != chosenItem) {
selectedItem.SideTabItemStatus = SideTabItemStatus.Selected; selectedItem.SideTabItemStatus = SideTabItemStatus.Selected;
} }
} }
} }
protected void OnChoosedItemChanged(EventArgs e) protected void OnChosenItemChanged(EventArgs e)
{ {
if (ChoosedItemChanged != null) { if (ChosenItemChanged != null) {
ChoosedItemChanged(this, e); ChosenItemChanged(this, e);
} }
} }
public event EventHandler ChoosedItemChanged; public event EventHandler ChosenItemChanged;
public SideTabItem ChoosedItem { public SideTabItem ChosenItem {
get { get {
return choosedItem; return chosenItem;
} }
set { set {
if (choosedItem != null) { if (chosenItem != null) {
choosedItem.SideTabItemStatus = SideTabItemStatus.Normal; chosenItem.SideTabItemStatus = SideTabItemStatus.Normal;
} }
choosedItem = value; chosenItem = value;
if (choosedItem != null) { if (chosenItem != null) {
choosedItem.SideTabItemStatus = SideTabItemStatus.Choosed; chosenItem.SideTabItemStatus = SideTabItemStatus.Chosen;
} }
OnChoosedItemChanged(null); OnChosenItemChanged(null);
} }
} }

4
src/Main/ICSharpCode.SharpDevelop.Widgets/Project/SideBar/SideTabItem.cs
Unescape View File

@ -25,7 +25,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
public enum SideTabItemStatus { public enum SideTabItemStatus {
Normal, Normal,
Selected, Selected,
Choosed, Chosen,
Drag Drag
} }
@ -150,7 +150,7 @@ namespace ICSharpCode.SharpDevelop.Widgets.SideBar
} }
g.DrawString(name, f, SystemBrushes.ControlText, new PointF(rectangle.X + width + 1, rectangle.Y + 1)); g.DrawString(name, f, SystemBrushes.ControlText, new PointF(rectangle.X + width + 1, rectangle.Y + 1));
break; break;
case SideTabItemStatus.Choosed: case SideTabItemStatus.Chosen:
ControlPaint.DrawBorder3D(g, rectangle, Border3DStyle.Sunken); ControlPaint.DrawBorder3D(g, rectangle, Border3DStyle.Sunken);
rectangle.X += 1; rectangle.X += 1;
rectangle.Y += 1; rectangle.Y += 1;

Write Preview
Loading…
Cancel
Save