diff --git a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2
index 1bb54cb..208025c 100644
Binary files a/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 and b/src/.vs/DesktopMagic/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/.vs/DesktopMagic/v16/.suo b/src/.vs/DesktopMagic/v16/.suo
index 71fcf9e..ccbb172 100644
Binary files a/src/.vs/DesktopMagic/v16/.suo and b/src/.vs/DesktopMagic/v16/.suo differ
diff --git a/src/DesktopMagic/MainWindow.xaml b/src/DesktopMagic/MainWindow.xaml
index b9f2109..52b8869 100644
--- a/src/DesktopMagic/MainWindow.xaml
+++ b/src/DesktopMagic/MainWindow.xaml
@@ -48,7 +48,7 @@
-
+
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index ae321ff..c136a03 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -423,9 +423,10 @@ namespace DesktopMagic
foreach (SettingElement settingElement in settingElements)
{
- StackPanel stackPanel = new()
+ DockPanel stackPanel = new()
{
- Orientation = Orientation.Horizontal
+ LastChildFill = true,
+ HorizontalAlignment = HorizontalAlignment.Stretch
};
_ = optionsPanel.Children.Add(stackPanel);
@@ -440,30 +441,61 @@ namespace DesktopMagic
stackPanel.UpdateLayout();
label.UpdateLayout();
- if (settingElement.Element is DesktopMagicPluginAPI.Inputs.Heading eHeading)
+ if (settingElement.Element is DesktopMagicPluginAPI.Inputs.Label eLabel)
{
- label.Text = eHeading.Value;
+ label.Text = eLabel.Value;
label.Margin = new Thickness(0, 5, 3, 0);
- label.FontWeight = FontWeights.Bold;
- label.Width = optionsPanel.ActualWidth;
+ label.HorizontalAlignment = HorizontalAlignment.Stretch;
label.TextWrapping = TextWrapping.WrapWithOverflow;
- eHeading.OnValueChanged += () =>
+
+ if (eLabel.Bold)
+ {
+ label.FontWeight = FontWeights.Bold;
+ }
+ eLabel.OnValueChanged += () =>
{
Dispatcher.Invoke(() =>
{
- label.Text = eHeading.Value;
+ label.Text = eLabel.Value;
Option_ValueChanged();
});
};
}
+ else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.Button eButton)
+ {
+ Button button = new()
+ {
+ Content = eButton.Value,
+ FontSize = 10,
+ Height = 20,
+ Margin = new Thickness(0, 10, 0, 10),
+ Padding = new Thickness(0),
+ VerticalAlignment = VerticalAlignment.Center,
+ HorizontalAlignment = HorizontalAlignment.Stretch
+ };
+ button.Click += (_s, _e) =>
+ {
+ eButton.Click();
+ };
+ eButton.OnValueChanged += () =>
+ {
+ Dispatcher.Invoke(() =>
+ {
+ button.Content = eButton.Value;
+ Option_ValueChanged();
+ });
+ };
+
+ _ = stackPanel.Children.Add(button);
+ }
else if (settingElement.Element is DesktopMagicPluginAPI.Inputs.CheckBox eCheckBox)
{
CheckBox checkBox = new()
{
IsChecked = eCheckBox.Value,
- Width = optionsPanel.ActualWidth - label.ActualWidth,
Style = (Style)FindResource("MaterialDesignDarkCheckBox"),
- VerticalAlignment = VerticalAlignment.Center
+ VerticalAlignment = VerticalAlignment.Center,
+ HorizontalAlignment = HorizontalAlignment.Stretch
};
checkBox.Click += (_s, _e) =>
{
@@ -486,8 +518,8 @@ namespace DesktopMagic
{
Text = eTextBox.Value,
TextWrapping = TextWrapping.Wrap,
- Width = optionsPanel.ActualWidth - label.ActualWidth,
- VerticalAlignment = VerticalAlignment.Center
+ VerticalAlignment = VerticalAlignment.Center,
+ HorizontalAlignment = HorizontalAlignment.Stretch
};
textBox.TextChanged += (_s, _e) =>
{
@@ -510,8 +542,8 @@ namespace DesktopMagic
Value = eIntegerUpDown.Value,
Minimum = eIntegerUpDown.Minimum,
Maximum = eIntegerUpDown.Maximum,
- Width = optionsPanel.ActualWidth - label.ActualWidth,
- VerticalAlignment = VerticalAlignment.Center
+ VerticalAlignment = VerticalAlignment.Center,
+ HorizontalAlignment = HorizontalAlignment.Stretch
};
integerUpDown.ValueChanged += (_s, _e) =>
{
@@ -536,8 +568,8 @@ namespace DesktopMagic
Maximum = eSlider.Maximum,
TickFrequency = 1,
IsSnapToTickEnabled = true,
- Width = optionsPanel.ActualWidth - label.ActualWidth,
- VerticalAlignment = VerticalAlignment.Center
+ VerticalAlignment = VerticalAlignment.Center,
+ HorizontalAlignment = HorizontalAlignment.Stretch
};
slider.ValueChanged += (_s, _e) =>
{
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll
index a962ab1..b9fb928 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb
index 3438da9..22fec52 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagic.pdb differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll
index a76490f..07156f6 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb
index aa2145f..4908d7e 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb and b/src/DesktopMagic/bin/Debug/net5.0-windows/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll
index a8808e2..8086553 100644
Binary files a/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/bin/Debug/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll
index 3e90cbf..f17328c 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb
index eda93d8..8c3bf70 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagic.pdb differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll
index 8a6ea8e..ff2dc35 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb
index 66a4c9f..b285fa0 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb and b/src/DesktopMagic/bin/Release/net5.0-windows/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll
index ac766fc..3a5ace1 100644
Binary files a/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/bin/Release/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll
index a962ab1..b9fb928 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources
index a6f57f6..7206bdc 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.g.resources differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb
index 3438da9..22fec52 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic.pdb differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
index 55632ed..aad124f 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/DesktopMagic_MarkupCompile.i.cache
@@ -16,5 +16,5 @@ C:\Users\David\Programmieren\DesktopMagic\src\DesktopMagic\App.xaml
226605658444
CalendarWindow.xaml;CpuUsageWindow.xaml;DateWindow.xaml;InputDialog.xaml;MainWindow.xaml;MusicVisualizerWindow.xaml;Plugin\PluginWindow.xaml;Resources\StringResources.de.xaml;Resources\StringResources.en.xaml;TimeWindow.xaml;
-False
+True
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs
index 59e385b..56f8122 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/InputDialog.g.i.cs
@@ -86,7 +86,7 @@ namespace DesktopMagic {
return;
}
_contentLoaded = true;
- System.Uri resourceLocater = new System.Uri("/DesktopMagic;component/inputdialog.xaml", System.UriKind.Relative);
+ System.Uri resourceLocater = new System.Uri("/DesktopMagic;V1.0.0.0;component/inputdialog.xaml", System.UriKind.Relative);
#line 1 "..\..\..\InputDialog.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml
index a3ad2b5..ed7b7a8 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml and b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.baml differ
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
index b080a69..2847ef5 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C65BB0CCBD38447F44B1617C45B72B340536B1CC"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs
index 134ea47..3c4121d 100644
--- a/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Debug/net5.0-windows/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C65BB0CCBD38447F44B1617C45B72B340536B1CC"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
diff --git a/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll
index a8808e2..8086553 100644
Binary files a/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/obj/Debug/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll
index 3e90cbf..f17328c 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.dll differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources
index 37b2f8a..2ecb05f 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.g.resources differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb
index eda93d8..8c3bf70 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb and b/src/DesktopMagic/obj/Release/net5.0-windows/DesktopMagic.pdb differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml
index e247621..414e3f1 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml and b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.baml differ
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs
index b080a69..2847ef5 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C65BB0CCBD38447F44B1617C45B72B340536B1CC"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
index b080a69..2847ef5 100644
--- a/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
+++ b/src/DesktopMagic/obj/Release/net5.0-windows/MainWindow.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "E2A0CEAB1CE4E799C8F11878BEEF4140351A3388"
+#pragma checksum "..\..\..\MainWindow.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C65BB0CCBD38447F44B1617C45B72B340536B1CC"
//------------------------------------------------------------------------------
//
// Dieser Code wurde von einem Tool generiert.
diff --git a/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll b/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll
index ac766fc..3a5ace1 100644
Binary files a/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll and b/src/DesktopMagic/obj/Release/net5.0-windows/ref/DesktopMagic.dll differ
diff --git a/src/DesktopMagicPlugin.Test/PluginScript.cs b/src/DesktopMagicPlugin.Test/PluginScript.cs
index 360aa97..5e04d8d 100644
--- a/src/DesktopMagicPlugin.Test/PluginScript.cs
+++ b/src/DesktopMagicPlugin.Test/PluginScript.cs
@@ -8,8 +8,11 @@ namespace DesktopMagicPlugin.Test
{
public class PluginScript : Plugin
{
- [Element("Heading")]
- private Heading heading = new Heading("");
+ [Element]
+ private Label heading = new Label("Heading", true);
+
+ [Element]
+ private Label label = new Label("");
[Element("Slider:")]
private Slider slider = new Slider(1, 23, 4);
@@ -17,10 +20,22 @@ namespace DesktopMagicPlugin.Test
[Element("Text:")]
private TextBox textBox = new TextBox("abc");
+ [Element]
+ private Button button = new Button("Press me!");
+
+ public override int UpdateInterval { get; set; }
+
public PluginScript()
{
slider.OnValueChanged += Slider_OnValueChanged;
textBox.OnValueChanged += TextBox_OnValueChanged;
+ button.OnClick += Button_OnClick; ;
+ }
+
+ private void Button_OnClick()
+ {
+ Debug.WriteLine("Button pressed");
+ Application.UpdateWindow();
}
private void TextBox_OnValueChanged()
@@ -42,7 +57,7 @@ namespace DesktopMagicPlugin.Test
g.Clear(Application.Color);
g.DrawString(str, new Font("arial", 10), Brushes.Black, new PointF(0, 0));
- heading.Value = str;
+ label.Value = str;
slider.Value++;
return bmp;
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll
index ab0f385..4e16ae1 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb
index 71e0b06..01ce4c2 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPlugin.Test.pdb differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll
index bad0bb0..07156f6 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb
index c0c68d2..4908d7e 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll
index a9588b7..5ea65eb 100644
Binary files a/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/bin/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll
index ab0f385..4e16ae1 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb
index 71e0b06..01ce4c2 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/DesktopMagicPlugin.Test.pdb differ
diff --git a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll
index a9588b7..5ea65eb 100644
Binary files a/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll and b/src/DesktopMagicPlugin.Test/obj/Debug/net5.0/ref/DesktopMagicPlugin.Test.dll differ
diff --git a/src/DesktopMagicPluginAPI/Inputs/Button.cs b/src/DesktopMagicPluginAPI/Inputs/Button.cs
new file mode 100644
index 0000000..32b6c0c
--- /dev/null
+++ b/src/DesktopMagicPluginAPI/Inputs/Button.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DesktopMagicPluginAPI.Inputs
+{
+ public class Button : Element
+ {
+ public event Action OnClick;
+
+ private string _value;
+
+ public string Value
+ {
+ get => _value;
+ set
+ {
+ if (_value != value)
+ {
+ _value = value;
+ ValueChanged();
+ }
+ }
+ }
+
+ public Button(string value)
+ {
+ Value = value;
+ }
+
+ public void Click()
+ {
+ OnClick?.Invoke();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs b/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
index 075e38e..b02fb4d 100644
--- a/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/ElementAttribute.cs
@@ -9,7 +9,7 @@ namespace DesktopMagicPluginAPI.Inputs
public string Name { get; }
public int OrderIndex { get; }
- public ElementAttribute(string name, int orderIndex = 0)
+ public ElementAttribute(string name = "", int orderIndex = 0)
{
Name = name;
OrderIndex = orderIndex;
diff --git a/src/DesktopMagicPluginAPI/Inputs/Heading.cs b/src/DesktopMagicPluginAPI/Inputs/Label.cs
similarity index 72%
rename from src/DesktopMagicPluginAPI/Inputs/Heading.cs
rename to src/DesktopMagicPluginAPI/Inputs/Label.cs
index fdb5a3d..cc27abb 100644
--- a/src/DesktopMagicPluginAPI/Inputs/Heading.cs
+++ b/src/DesktopMagicPluginAPI/Inputs/Label.cs
@@ -1,6 +1,6 @@
namespace DesktopMagicPluginAPI.Inputs
{
- public class Heading : Element
+ public class Label : Element
{
private string _value;
@@ -17,9 +17,12 @@
}
}
- public Heading(string value)
+ public bool Bold { get; set; }
+
+ public Label(string value, bool bold = false)
{
Value = value;
+ Bold = bold;
}
}
}
\ No newline at end of file
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll
index a76490f..07156f6 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb
index aa2145f..4908d7e 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll
index 5fd30e6..69957ea 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Debug/net5.0/ref/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll
index 8a6ea8e..ff2dc35 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb
index 66a4c9f..b285fa0 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll
index 319d88e..cfe0b25 100644
Binary files a/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/bin/Release/net5.0/ref/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
index d5200e9..f3c6949 100644
--- a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-3d351e819578d1d8c8cf3fc4ddef05ac96911424
+ced4ac85c0c7d0fe87e126147d10f5c33d432ea7
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll
index a76490f..07156f6 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb
index aa2145f..4908d7e 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll
index 5fd30e6..69957ea 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Debug/net5.0/ref/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
index 8d99647..aa97f33 100644
--- a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
+++ b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-78b084028688b20b372609aac30267390d5f6d25
+801158c4d5ba4b4a8b0e6e57ad9e67f56077c71a
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll
index 8a6ea8e..ff2dc35 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.dll differ
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb
index 66a4c9f..b285fa0 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/DesktopMagicPluginAPI.pdb differ
diff --git a/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll b/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll
index 319d88e..cfe0b25 100644
Binary files a/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll and b/src/DesktopMagicPluginAPI/obj/Release/net5.0/ref/DesktopMagicPluginAPI.dll differ