Browse Source

- Modify and add more default sizes for controls.

- Fix a bug where the editor used to highlight NaN for double as "Not in range."

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6327 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Kumar Devvrat 16 years ago
parent
commit
27535f252e
  1. 18
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/BasicMetadata.cs
  2. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/NumberEditor.xaml.cs

18
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/BasicMetadata.cs

@ -237,19 +237,27 @@ namespace ICSharpCode.WpfDesign.Designer @@ -237,19 +237,27 @@ namespace ICSharpCode.WpfDesign.Designer
Metadata.AddPopularControl(typeof(WrapPanel));
Metadata.AddDefaultSize(typeof(UIElement), new Size(120, 100));
Metadata.AddDefaultSize(typeof(ContentControl), new Size(double.NaN, double.NaN));
Metadata.AddDefaultSize(typeof(ContentControl), new Size(120, 20));
Metadata.AddDefaultSize(typeof(Button), new Size(75, 23));
var s1 = new Size(120, double.NaN);
var s1 = new Size(120, 20);
Metadata.AddDefaultSize(typeof(Slider), s1);
Metadata.AddDefaultSize(typeof(TextBox), s1);
Metadata.AddDefaultSize(typeof(PasswordBox), s1);
Metadata.AddDefaultSize(typeof(ComboBox), s1);
Metadata.AddDefaultSize(typeof(ProgressBar), s1);
var s2 = new Size(120, 20);
Metadata.AddDefaultSize(typeof(ToolBar), s2);
Metadata.AddDefaultSize(typeof(Menu), s2);
Metadata.AddDefaultSize(typeof(ToolBar), s1);
Metadata.AddDefaultSize(typeof(Menu), s1);
var s2=new Size(120,120);
Metadata.AddDefaultSize(typeof(InkCanvas),s2);
Metadata.AddDefaultSize(typeof(Image),s2);
Metadata.AddDefaultSize(typeof(TreeView),s2);
var s3=new Size(130,120);
Metadata.AddDefaultSize(typeof(Label),s3);
Metadata.AddDefaultSize(typeof(Expander),s3);
}
}
}

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/NumberEditor.xaml.cs

@ -130,7 +130,7 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors @@ -130,7 +130,7 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors
double val;
if(double.TryParse(textBox.Text, out val)){
if(PropertyNode.FirstProperty.TypeConverter.IsValid(textBox.Text)){
if(val >= Minimum && val <= Maximum){
if(val >= Minimum && val <= Maximum || double.IsNaN(val)){
textBox.Foreground=Brushes.Black;
textBox.ToolTip=textBox.Text;
}else{

Loading…
Cancel
Save