Moved InputBaseUpDown Style & Template into InputBaseUpDown.xaml

Dirkster99 · May 23, 2020 · fe1c353 · fe1c353
1 parent aeb6005
commit fe1c353
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/...UpDownLib/Base/AbstractBaseUpDown.xaml.cs → ...mericUpDownLib/Base/AbstractBaseUpDown.cs b/...UpDownLib/Base/AbstractBaseUpDown.xaml.cs → ...mericUpDownLib/Base/AbstractBaseUpDown.cs
diff --git a/...ricUpDownLib/Base/AbstractBaseUpDown.xaml → ...umericUpDownLib/Base/InputBaseUpDown.xaml b/...ricUpDownLib/Base/AbstractBaseUpDown.xaml → ...umericUpDownLib/Base/InputBaseUpDown.xaml
diff --git a/.../NumericUpDownLib/Base/InputBaseUpDown.cs → ...ricUpDownLib/Base/InputBaseUpDown.xaml.cs b/.../NumericUpDownLib/Base/InputBaseUpDown.cs → ...ricUpDownLib/Base/InputBaseUpDown.xaml.cs
diff --git a/source/NumericUpDownLib/NumericUpDownLib.csproj b/source/NumericUpDownLib/NumericUpDownLib.csproj
@@ -28,17 +28,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Base\AbstractBaseUpDown.xaml.cs">
+    <!--Compile Update="Base\AbstractBaseUpDown.xaml.cs">
       <DependentUpon>AbstractBaseUpDown.xaml</DependentUpon>
-    </Compile>
+    </Compile-->
     <Compile Update="Base\NumericRepeatButtonControl.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>NumericRepeatButtonControl.xaml</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <Page Update="Base\AbstractBaseUpDown.xaml">
+    <Page Update="Base\InputBaseUpDown.xaml">
       <SubType>Designer</SubType>
     </Page>
     <Page Update="Base\NumericRepeatButtonControl.xaml">

diff --git a/source/NumericUpDownLib/NumericUpDownLib.csproj.user b/source/NumericUpDownLib/NumericUpDownLib.csproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
   <ItemGroup>
-    <Page Update="Base\AbstractBaseUpDown.xaml">
+    <Page Update="Base\InputBaseUpDown.xaml">
       <SubType>Designer</SubType>
     </Page>
     <Page Update="Base\NumericRepeatButtonControl.xaml">

diff --git a/source/NumericUpDownLib/Themes/Generic.xaml b/source/NumericUpDownLib/Themes/Generic.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<ResourceDictionary.MergedDictionaries>
 		<ResourceDictionary Source="/NumericUpDownLib;component/Base/NumericRepeatButtonControl.xaml" />
-		<ResourceDictionary Source="/NumericUpDownLib;component/Base/AbstractBaseUpDown.xaml" />
+		<ResourceDictionary Source="/NumericUpDownLib;component/Base/InputBaseUpDown.xaml" />
 		<ResourceDictionary Source="/NumericUpDownLib;component/Themes/LightBrushs.xaml" />
 	</ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>