Browse Source

fix #338: Pads on Auto-Hide Show Toolbars Either Cut-Off or Squished

pull/341/head
Siegfried Pammer 12 years ago
parent
commit
b8cebbf45d
  1. 10
      src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs
  2. 14
      src/Main/Base/Project/Editor/Search/SearchResultsPad.cs
  3. 10
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs
  4. 6
      src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs
  5. 10
      src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

10
src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs

@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
{
public class WatchPad : AbstractPadContent
{
DockPanel panel;
Grid panel;
ToolBar toolBar;
SharpTreeView tree;
@ -60,10 +60,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -60,10 +60,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
var res = new CommonResources();
res.InitializeComponent();
panel = new DockPanel();
panel = new Grid();
toolBar = ToolBarService.CreateToolBar(toolBar, this, "/SharpDevelop/Pads/WatchPad/ToolBar");
toolBar.SetValue(DockPanel.DockProperty, Dock.Top);
panel.Children.Add(toolBar);
tree = new SharpTreeView();
@ -78,6 +77,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -78,6 +77,11 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
};
panel.Children.Add(tree);
panel.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
panel.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
Grid.SetRow(tree, 1);
// ProjectService.SolutionLoaded += delegate { LoadNodes(); };
// SD.ProjectService.CurrentSolution.PreferencesSaving += delegate { SaveNodes(); };
// LoadNodes();

14
src/Main/Base/Project/Editor/Search/SearchResultsPad.cs

@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Search @@ -51,7 +51,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
}
}
DockPanel dockPanel;
Grid contentPanel;
ToolBar toolBar;
ContentPresenter contentPlaceholder;
IList defaultToolbarItems;
@ -63,21 +63,25 @@ namespace ICSharpCode.SharpDevelop.Editor.Search @@ -63,21 +63,25 @@ namespace ICSharpCode.SharpDevelop.Editor.Search
instance = this;
toolBar = new ToolBar();
ToolBarTray.SetIsLocked(toolBar, true);
defaultToolbarItems = ToolBarService.CreateToolBarItems(dockPanel, this, "/SharpDevelop/Pads/SearchResultPad/Toolbar");
defaultToolbarItems = ToolBarService.CreateToolBarItems(contentPanel, this, "/SharpDevelop/Pads/SearchResultPad/Toolbar");
foreach (object toolBarItem in defaultToolbarItems) {
toolBar.Items.Add(toolBarItem);
}
DockPanel.SetDock(toolBar, Dock.Top);
contentPlaceholder = new ContentPresenter();
dockPanel = new DockPanel {
contentPanel = new Grid {
Children = { toolBar, contentPlaceholder }
};
contentPanel.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
contentPanel.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
Grid.SetRow(contentPlaceholder, 1);
}
public override object Control {
get {
return dockPanel;
return contentPanel;
}
}

10
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageView.cs

@ -24,6 +24,7 @@ using System.Linq; @@ -24,6 +24,7 @@ using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
@ -177,7 +178,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -177,7 +178,7 @@ namespace ICSharpCode.SharpDevelop.Gui
#endregion
TextEditor textEditor = new TextEditor();
DockPanel panel = new DockPanel();
Grid panel = new Grid();
ToolBar toolStrip;
List<MessageViewCategory> messageCategories = new List<MessageViewCategory>();
@ -251,7 +252,6 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -251,7 +252,6 @@ namespace ICSharpCode.SharpDevelop.Gui
AddCategory(TaskService.BuildMessageViewCategory);
textEditor.IsReadOnly = true;
textEditor.ContextMenu = MenuService.CreateContextMenu(this, "/SharpDevelop/Pads/CompilerMessageView/ContextMenu");
properties = PropertyService.NestedProperties(OutputWindowOptionsPanel.OutputWindowsProperty);
@ -264,10 +264,14 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -264,10 +264,14 @@ namespace ICSharpCode.SharpDevelop.Gui
textEditor.TextArea.TextView.ElementGenerators.OfType<LinkElementGenerator>().ForEach(x => x.RequireControlModifierForClick = false);
toolStrip = ToolBarService.CreateToolBar(panel, this, "/SharpDevelop/Pads/CompilerMessageView/Toolbar");
toolStrip.SetValue(DockPanel.DockProperty, Dock.Top);
toolStrip.Items.OfType<ComboBox>().ForEach(b => b.MinWidth = 75);
panel.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
panel.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
panel.Children.Add(toolStrip);
panel.Children.Add(textEditor);
Grid.SetRow(textEditor, 1);
SetWordWrap();
DisplayActiveCategory();

6
src/Main/Base/Project/Src/Gui/Pads/ErrorList/ErrorListPad.cs

@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
ToolBar toolBar;
DockPanel contentPanel = new DockPanel();
Grid contentPanel = new Grid();
ListView errorView = new ListView();
readonly ObservableCollection<SDTask> errors;
@ -112,9 +112,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -112,9 +112,11 @@ namespace ICSharpCode.SharpDevelop.Gui
toolBar = ToolBarService.CreateToolBar(contentPanel, this, "/SharpDevelop/Pads/ErrorList/Toolbar");
contentPanel.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
contentPanel.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
contentPanel.Children.Add(toolBar);
toolBar.SetValue(DockPanel.DockProperty, Dock.Top);
contentPanel.Children.Add(errorView);
Grid.SetRow(errorView, 1);
errorView.ItemsSource = errors;
errorView.MouseDoubleClick += ErrorViewMouseDoubleClick;
errorView.Style = (Style)new TaskViewResources()["TaskListView"];

10
src/Main/Base/Project/Src/Gui/Pads/TaskList/TaskListPad.cs

@ -49,7 +49,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -49,7 +49,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
ToolBar toolBar;
DockPanel contentPanel = new DockPanel();
Grid contentPanel = new Grid();
ListView taskView = new ListView();
@ -159,9 +159,15 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -159,9 +159,15 @@ namespace ICSharpCode.SharpDevelop.Gui
items.Add(new TaskListTokensToolbarCheckBox(token));
}
toolBar.Items.OfType<ComboBox>().ForEach(b => b.MinWidth = 75);
contentPanel.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
contentPanel.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
contentPanel.Children.Add(toolBar);
toolBar.SetValue(DockPanel.DockProperty, Dock.Top);
contentPanel.Children.Add(taskView);
Grid.SetRow(taskView, 1);
taskView.ItemsSource = tasks;
taskView.MouseDoubleClick += TaskViewMouseDoubleClick;
taskView.Style = (Style)new TaskViewResources()["TaskListView"];

Loading…
Cancel
Save