From fa0d2801303fe6f18284193f78766574d723cb24 Mon Sep 17 00:00:00 2001 From: GG Z <903524121@qq.com> Date: Fri, 2 Jan 2026 17:30:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Appearance/ControlsDictionary.cs | 2 +- .../Appearance/ThemeManager.cs | 2 +- .../Appearance/ThemeMode.cs | 2 +- .../Appearance/ThemePreferenceStore.cs | 2 +- .../Appearance/ThemesDictionary.cs | 6 +- .../Assets/MaterialSymbol.cs | 2 +- .../Assets/MaterialSymbols.xaml | 0 .../Assets/MaterialSymbolsRounded-Regular.ttf | Bin .../Assists/BehaviorAssist.cs | 6 +- .../Assists/BindingProxy.cs | 2 +- .../{NeoUI => Melskin}/Assists/ColorAssist.cs | 4 +- .../Assists/ControlAssist.cs | 4 +- .../Assists/DataGridAssist.cs | 2 +- .../{NeoUI => Melskin}/Assists/InputAssist.cs | 4 +- .../Assists/ShadingAssist.cs | 2 +- NeoUI/{NeoUI => Melskin}/Assists/TabAssist.cs | 2 +- .../Controls/Accordion.xaml | 110 ++-- .../Controls/Accordion.xaml.cs | 2 +- .../Controls/AccordionItem.cs | 2 +- NeoUI/{NeoUI => Melskin}/Controls/Alert.xaml | 138 ++-- .../{NeoUI => Melskin}/Controls/Alert.xaml.cs | 2 +- NeoUI/{NeoUI => Melskin}/Controls/Anchor.xaml | 98 +-- .../Controls/Anchor.xaml.cs | 9 +- .../Controls/AppearanceType.cs | 2 +- .../Controls/AutoComplete.xaml | 44 +- .../Controls/AutoComplete.xaml.cs | 2 +- NeoUI/{NeoUI => Melskin}/Controls/Avatar.xaml | 34 +- .../Controls/Avatar.xaml.cs | 2 +- NeoUI/{NeoUI => Melskin}/Controls/Badge.xaml | 108 ++-- .../{NeoUI => Melskin}/Controls/Badge.xaml.cs | 2 +- .../Controls/Breadcrumb.xaml | 44 +- .../Controls/Breadcrumb.xaml.cs | 2 +- NeoUI/{NeoUI => Melskin}/Controls/Button.xaml | 312 ++++----- .../{NeoUI => Melskin}/Controls/Calendar.xaml | 178 +++--- NeoUI/{NeoUI => Melskin}/Controls/Card.xaml | 32 +- .../{NeoUI => Melskin}/Controls/Card.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/Cascader.xaml | 114 ++-- .../Controls/Cascader.xaml.cs | 4 +- .../{NeoUI => Melskin}/Controls/CheckBox.xaml | 210 +++--- .../Controls/CheckableTag.xaml | 26 +- .../Controls/CheckableTag.xaml.cs | 2 +- NeoUI/{NeoUI => Melskin}/Controls/Chip.xaml | 72 +-- .../{NeoUI => Melskin}/Controls/Chip.xaml.cs | 2 +- .../Controls/ChooseBox.xaml | 108 ++-- .../Controls/ChooseBox.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/CodeBox.xaml | 80 +-- .../Controls/CodeBox.xaml.cs | 2 +- .../Controls/ColorPicker/ColorInputMode.cs | 2 +- .../Controls/ColorPicker/ColorPanel.xaml | 90 +-- .../Controls/ColorPicker/ColorPanel.xaml.cs | 4 +- .../Controls/ColorPicker/ColorPicker.xaml | 52 +- .../Controls/ColorPicker/ColorPicker.xaml.cs | 2 +- .../Controls/ColorPicker/HSVColor.cs | 2 +- .../{NeoUI => Melskin}/Controls/ComboBox.xaml | 598 +++++++++--------- .../{NeoUI => Melskin}/Controls/DataGrid.xaml | 288 ++++----- .../Controls/DatePicker.xaml | 220 +++---- .../Controls/Decorations/DecorationBase.cs | 2 +- .../Controls/Decorations/EmbossBorder.xaml | 34 +- .../Controls/Decorations/EmbossBorder.xaml.cs | 2 +- .../Decorations/GlassChromeDecorator.cs | 4 +- .../Controls/Decorations/LightedSurface.xaml | 26 +- .../Decorations/LightedSurface.xaml.cs | 4 +- .../Controls/Decorations/SlotBorder.xaml | 44 +- .../Controls/Decorations/SlotBorder.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/Divider.xaml | 46 +- .../Controls/Divider.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/Expander.xaml | 166 ++--- .../Controls/FlattenButton.xaml | 28 +- .../Controls/FlattenComboBox.xaml | 130 ++-- .../Controls/FlattenTextBox.xaml | 18 +- .../{NeoUI => Melskin}/Controls/GroupBox.xaml | 0 .../{NeoUI => Melskin}/Controls/Heading.xaml | 4 +- .../Controls/Heading.xaml.cs | 2 +- .../Controls/Hyperlink.xaml | 30 +- .../Controls/Hyperlink.xaml.cs | 2 +- .../Controls/IconElement.xaml | 64 +- .../Controls/IconElement.xaml.cs | 6 +- NeoUI/{NeoUI => Melskin}/Controls/Label.xaml | 32 +- .../{NeoUI => Melskin}/Controls/ListBox.xaml | 208 +++--- .../{NeoUI => Melskin}/Controls/ListView.xaml | 86 +-- .../Controls/MelWindow.xaml} | 134 ++-- .../Controls/MelWindow.xaml.cs} | 4 +- NeoUI/{NeoUI => Melskin}/Controls/Menu.xaml | 410 ++++++------ .../Controls/Modal/Modal.cs | 2 +- .../Controls/Modal/ModalWindow.xaml | 50 +- .../Controls/Modal/ModalWindow.xaml.cs | 2 +- .../Controls/MultiComboBox.xaml | 114 ++-- .../Controls/MultiComboBox.xaml.cs | 2 +- .../Controls/MultiTreeView.xaml | 62 +- .../Controls/MultiTreeView.xaml.cs | 2 +- .../Controls/NeuDataGrid.xaml.cs | 4 +- .../Controls/Notification/Notification.cs | 2 +- .../Notification/NotificationModel.cs | 2 +- .../Notification/NotificationPlacement.cs | 2 +- .../Controls/Notification/NotificationType.cs | 2 +- .../Notification/NotificationView.xaml | 46 +- .../Notification/NotificationView.xaml.cs | 2 +- .../Controls/NumberBox.xaml | 172 ++--- .../Controls/NumberBox.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/NumericBox.cs | 2 +- .../Controls/Pagination.xaml | 76 +-- .../Controls/Pagination.xaml.cs | 4 +- .../Controls/PasswordBox.xaml | 222 +++---- .../Controls/ProgressBar.xaml | 88 +-- .../Controls/PropertyField.xaml | 6 +- .../Controls/PropertyField.xaml.cs | 2 +- .../Controls/RadioButton.xaml | 174 ++--- .../Controls/RepeatButtonTransparent.xaml | 0 .../Controls/ScrollViewer.xaml | 196 +++--- .../Controls/Separator.xaml | 0 NeoUI/{NeoUI => Melskin}/Controls/Slider.xaml | 432 ++++++------- NeoUI/{NeoUI => Melskin}/Controls/Spin.xaml | 118 ++-- .../{NeoUI => Melskin}/Controls/Spin.xaml.cs | 2 +- .../Controls/SplashWindow/Border.cs | 2 +- .../Controls/SplashWindow/MathHelper.cs | 2 +- .../Controls/SplashWindow/Splash.cs | 2 +- .../Controls/SplashWindow/SplashConfig.cs | 4 +- .../Controls/SplashWindow/SplashWindow.xaml | 28 +- .../SplashWindow/SplashWindow.xaml.cs | 2 +- .../Controls/StatusBar.xaml | 0 .../Controls/TabControl.xaml | 360 +++++------ NeoUI/{NeoUI => Melskin}/Controls/Tag.xaml | 74 +-- NeoUI/{NeoUI => Melskin}/Controls/Tag.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/TextBox.xaml | 296 ++++----- .../Controls/TextBoxContextMenu.xaml | 20 +- .../Controls/TimePicker.xaml | 114 ++-- .../Controls/TimePicker.xaml.cs | 2 +- .../Controls/Toast/IToastHost.cs | 2 +- .../Controls/Toast/IToastService.cs | 2 +- .../Controls/Toast/ScreenHost.cs | 2 +- .../Controls/Toast/Toast.cs | 2 +- .../Controls/Toast/ToastControl.xaml | 30 +- .../Controls/Toast/ToastControl.xaml.cs | 2 +- .../Controls/Toast/ToastManager.cs | 2 +- .../Controls/Toast/ToastType.cs | 2 +- .../Controls/Toast/WindowHost.cs | 2 +- .../Controls/ToggleButton.xaml | 104 +-- .../Controls/ToggleSwitch.xaml | 236 +++---- .../Controls/ToggleSwitch.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/ToolBar.xaml | 132 ++-- NeoUI/Melskin/Controls/ToolTip.xaml | 79 +++ .../{NeoUI => Melskin}/Controls/TreeGrid.xaml | 22 +- .../Controls/TreeGrid.xaml.cs | 2 +- .../{NeoUI => Melskin}/Controls/TreeView.xaml | 78 +-- .../Controls/UploadArea.xaml | 62 +- .../Controls/UploadArea.xaml.cs | 4 +- NeoUI/{NeoUI => Melskin}/Controls/Variant.cs | 2 +- .../Controls/VistaFolderBrowserDialog.cs | 2 +- .../Converters/BooleanConverter.cs | 2 +- .../BooleanToVisibilityConverter.cs | 2 +- .../Converters/ComparisionConverter.cs | 2 +- .../ComparisionToVisibilityConverter.cs | 2 +- .../Converters/DivideByTwoConverter.cs | 2 +- .../Internal/AlphaToPercentConverter.cs | 2 +- .../Internal/ColorToHexConverter.cs | 2 +- .../Internal/ColorToOpaqueColorConverter.cs | 2 +- .../CreateSlotClipGeometryConverter.cs | 2 +- .../Internal/DoubleToCornerRadiusConverter.cs | 2 +- .../Internal/HasChildrenMultiConverter.cs | 2 +- .../Internal/HueToBrushConverter.cs | 4 +- .../Internal/HueToColorConverter.cs | 4 +- .../IntensityToEmbossBlurConverter.cs | 2 +- ...IntensityToEmbossMarginLeftTopConverter.cs | 2 +- ...nsityToEmbossMarginRightBottomConverter.cs | 2 +- .../Internal/IntensityToSlotBlurConverter.cs | 2 +- .../IntensityToSlotLightMarginConverter.cs | 2 +- .../IntensityToSlotMarginConverter.cs | 2 +- .../IntensityToSlotShadowMarginConverter.cs | 2 +- .../Internal/InterlacedBackgroundConverter.cs | 2 +- .../Internal/InverseOpacityConverter.cs | 2 +- .../Internal/IsLastItemConverter.cs | 2 +- .../Internal/PropertyValueConverter.cs | 2 +- .../Internal/StringToCodeConverter.cs | 2 +- .../Internal/StringToMarkDownConverter.cs | 2 +- .../Internal/SymbolToCharConverter.cs | 4 +- .../Internal/ThumbPositionConverter.cs | 2 +- .../Internal/ValueToRangeWidthConverter.cs | 2 +- .../Converters/InvertBooleanConverter.cs | 2 +- .../Converters/NullOrEmptyConverter.cs | 2 +- .../Converters/PercentageConverter.cs | 2 +- .../Converters/StringMatchConverter.cs | 2 +- .../Effects/BrightnessContrastEffect.cs | 4 +- .../Effects/LightedSurfaceEffect.cs | 4 +- .../Extensions/StringExtensions.cs | 2 +- .../Extensions/VisualExtensions.cs | 2 +- NeoUI/{NeoUI => Melskin}/GlobalUsings.cs | 0 .../Layout/FlexibleRowPanel.cs | 2 +- NeoUI/{NeoUI => Melskin}/Layout/Grid.cs | 4 +- NeoUI/{NeoUI => Melskin}/Layout/StackPanel.cs | 2 +- NeoUI/{NeoUI => Melskin}/Layout/TableGrid.cs | 2 +- .../{NeoUI => Melskin}/Layout/UniformGrid.cs | 2 +- .../Layout/WaterfallPanel.cs | 2 +- NeoUI/{NeoUI => Melskin}/Layout/WrapPanel.cs | 2 +- .../Markup/EnumSourceExtension.cs | 2 +- .../Markup/IconExtension.cs | 15 +- .../Markup/SymbolIconExtension.cs | 4 +- NeoUI/Melskin/Melskin.csproj | 48 ++ .../Properties/AssemblyInfo.cs | 19 +- .../Resources/Tools/EffectShaderCompiler.exe | Bin .../Resources/Tools/Resources/fxc.exe | Bin .../Shaders/BrightnessContrastEffect.hlsl | 0 .../Shaders/BrightnessContrastEffect.ps | Bin .../Shaders/CompileEffect.bat | 0 .../Shaders/LightedSurfaceEffect.hlsl | 0 .../Shaders/LightedSurfaceEffect.ps | Bin .../Themes/Accents/DarkBlue.xaml | 0 .../Themes/Accents/DarkGreen.xaml | 0 .../Themes/Accents/DarkPurple.xaml | 0 .../Themes/Accents/LightBlue.xaml | 0 .../Themes/Accents/LightGreen.xaml | 0 .../Themes/Accents/LightPurple.xaml | 0 .../{NeoUI => Melskin}/Themes/Animations.xaml | 0 NeoUI/{NeoUI => Melskin}/Themes/Dark.xaml | 0 NeoUI/{NeoUI => Melskin}/Themes/Fonts.xaml | 2 +- NeoUI/{NeoUI => Melskin}/Themes/Generic.xaml | 4 +- NeoUI/{NeoUI => Melskin}/Themes/Light.xaml | 0 NeoUI/{NeoUI => Melskin}/Themes/Metrics.xaml | 0 NeoUI/Melskin/Themes/Styles.xaml | 73 +++ .../Utilities/RelayCommand.cs | 2 +- NeoUI/{NeoUITest => MelskinTest}/App.xaml | 12 +- NeoUI/{NeoUITest => MelskinTest}/App.xaml.cs | 6 +- .../ColorPaletteControl.xaml | 4 +- .../ColorPaletteControl.xaml.cs | 2 +- .../ColorPaletteWindow.xaml | 22 +- .../ColorPaletteWindow.xaml.cs | 2 +- .../ControlTestWindow.xaml | 4 +- .../ControlTestWindow.xaml.cs | 4 +- .../DataModel/DataGridItem.cs | 2 +- .../DataModel/TreeItemData.cs | 2 +- .../IconsWindow.xaml | 4 +- .../IconsWindow.xaml.cs | 4 +- .../MainWindow.xaml | 6 +- .../MainWindow.xaml.cs | 6 +- NeoUI/MelskinTest/MelskinTest.csproj | 38 ++ .../NeumorphismWindow.xaml | 6 +- .../NeumorphismWindow.xaml.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../Resources/Images/ImageTest.png | Bin .../Resources/Images/image.png | Bin .../Resources/Images/image.webp | Bin NeoUI/{NeoUITest => MelskinTest}/ViewModel.cs | 2 +- NeoUI/NeoUI/Controls/ToolTip.xaml | 79 --- NeoUI/NeoUI/Themes/Styles.xaml | 73 --- NeoUI/VariaStudio/VariaStudio.csproj | 48 ++ NeoUI/VariaStudioTest/VariaStudioTest.csproj | 38 ++ 245 files changed, 4405 insertions(+), 4236 deletions(-) rename NeoUI/{NeoUI => Melskin}/Appearance/ControlsDictionary.cs (97%) rename NeoUI/{NeoUI => Melskin}/Appearance/ThemeManager.cs (99%) rename NeoUI/{NeoUI => Melskin}/Appearance/ThemeMode.cs (95%) rename NeoUI/{NeoUI => Melskin}/Appearance/ThemePreferenceStore.cs (98%) rename NeoUI/{NeoUI => Melskin}/Appearance/ThemesDictionary.cs (94%) rename NeoUI/{NeoUI => Melskin}/Assets/MaterialSymbol.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assets/MaterialSymbols.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Assets/MaterialSymbolsRounded-Regular.ttf (100%) rename NeoUI/{NeoUI => Melskin}/Assists/BehaviorAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assists/BindingProxy.cs (96%) rename NeoUI/{NeoUI => Melskin}/Assists/ColorAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assists/ControlAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assists/DataGridAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assists/InputAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assists/ShadingAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Assists/TabAssist.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Accordion.xaml (91%) rename NeoUI/{NeoUI => Melskin}/Controls/Accordion.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/AccordionItem.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Alert.xaml (83%) rename NeoUI/{NeoUI => Melskin}/Controls/Alert.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Anchor.xaml (76%) rename NeoUI/{NeoUI => Melskin}/Controls/Anchor.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/AppearanceType.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/AutoComplete.xaml (87%) rename NeoUI/{NeoUI => Melskin}/Controls/AutoComplete.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Avatar.xaml (89%) rename NeoUI/{NeoUI => Melskin}/Controls/Avatar.xaml.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Badge.xaml (67%) rename NeoUI/{NeoUI => Melskin}/Controls/Badge.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Breadcrumb.xaml (84%) rename NeoUI/{NeoUI => Melskin}/Controls/Breadcrumb.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Button.xaml (79%) rename NeoUI/{NeoUI => Melskin}/Controls/Calendar.xaml (77%) rename NeoUI/{NeoUI => Melskin}/Controls/Card.xaml (84%) rename NeoUI/{NeoUI => Melskin}/Controls/Card.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Cascader.xaml (87%) rename NeoUI/{NeoUI => Melskin}/Controls/Cascader.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/CheckBox.xaml (64%) rename NeoUI/{NeoUI => Melskin}/Controls/CheckableTag.xaml (89%) rename NeoUI/{NeoUI => Melskin}/Controls/CheckableTag.xaml.cs (92%) rename NeoUI/{NeoUI => Melskin}/Controls/Chip.xaml (82%) rename NeoUI/{NeoUI => Melskin}/Controls/Chip.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/ChooseBox.xaml (88%) rename NeoUI/{NeoUI => Melskin}/Controls/ChooseBox.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/CodeBox.xaml (83%) rename NeoUI/{NeoUI => Melskin}/Controls/CodeBox.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/ColorPicker/ColorInputMode.cs (96%) rename NeoUI/{NeoUI => Melskin}/Controls/ColorPicker/ColorPanel.xaml (83%) rename NeoUI/{NeoUI => Melskin}/Controls/ColorPicker/ColorPanel.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/ColorPicker/ColorPicker.xaml (89%) rename NeoUI/{NeoUI => Melskin}/Controls/ColorPicker/ColorPicker.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/ColorPicker/HSVColor.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/ComboBox.xaml (73%) rename NeoUI/{NeoUI => Melskin}/Controls/DataGrid.xaml (85%) rename NeoUI/{NeoUI => Melskin}/Controls/DatePicker.xaml (82%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/DecorationBase.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/EmbossBorder.xaml (88%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/EmbossBorder.xaml.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/GlassChromeDecorator.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/LightedSurface.xaml (87%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/LightedSurface.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/SlotBorder.xaml (92%) rename NeoUI/{NeoUI => Melskin}/Controls/Decorations/SlotBorder.xaml.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Divider.xaml (68%) rename NeoUI/{NeoUI => Melskin}/Controls/Divider.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Expander.xaml (77%) rename NeoUI/{NeoUI => Melskin}/Controls/FlattenButton.xaml (81%) rename NeoUI/{NeoUI => Melskin}/Controls/FlattenComboBox.xaml (75%) rename NeoUI/{NeoUI => Melskin}/Controls/FlattenTextBox.xaml (78%) rename NeoUI/{NeoUI => Melskin}/Controls/GroupBox.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Controls/Heading.xaml (94%) rename NeoUI/{NeoUI => Melskin}/Controls/Heading.xaml.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Hyperlink.xaml (72%) rename NeoUI/{NeoUI => Melskin}/Controls/Hyperlink.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/IconElement.xaml (81%) rename NeoUI/{NeoUI => Melskin}/Controls/IconElement.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Label.xaml (81%) rename NeoUI/{NeoUI => Melskin}/Controls/ListBox.xaml (83%) rename NeoUI/{NeoUI => Melskin}/Controls/ListView.xaml (84%) rename NeoUI/{NeoUI/Controls/NeoWindow.xaml => Melskin/Controls/MelWindow.xaml} (90%) rename NeoUI/{NeoUI/Controls/NeoWindow.xaml.cs => Melskin/Controls/MelWindow.xaml.cs} (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Menu.xaml (73%) rename NeoUI/{NeoUI => Melskin}/Controls/Modal/Modal.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Modal/ModalWindow.xaml (86%) rename NeoUI/{NeoUI => Melskin}/Controls/Modal/ModalWindow.xaml.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/MultiComboBox.xaml (88%) rename NeoUI/{NeoUI => Melskin}/Controls/MultiComboBox.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/MultiTreeView.xaml (87%) rename NeoUI/{NeoUI => Melskin}/Controls/MultiTreeView.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/NeuDataGrid.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Notification/Notification.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Notification/NotificationModel.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Notification/NotificationPlacement.cs (96%) rename NeoUI/{NeoUI => Melskin}/Controls/Notification/NotificationType.cs (97%) rename NeoUI/{NeoUI => Melskin}/Controls/Notification/NotificationView.xaml (91%) rename NeoUI/{NeoUI => Melskin}/Controls/Notification/NotificationView.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/NumberBox.xaml (84%) rename NeoUI/{NeoUI => Melskin}/Controls/NumberBox.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/NumericBox.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Pagination.xaml (86%) rename NeoUI/{NeoUI => Melskin}/Controls/Pagination.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/PasswordBox.xaml (84%) rename NeoUI/{NeoUI => Melskin}/Controls/ProgressBar.xaml (84%) rename NeoUI/{NeoUI => Melskin}/Controls/PropertyField.xaml (86%) rename NeoUI/{NeoUI => Melskin}/Controls/PropertyField.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/RadioButton.xaml (67%) rename NeoUI/{NeoUI => Melskin}/Controls/RepeatButtonTransparent.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Controls/ScrollViewer.xaml (80%) rename NeoUI/{NeoUI => Melskin}/Controls/Separator.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Controls/Slider.xaml (78%) rename NeoUI/{NeoUI => Melskin}/Controls/Spin.xaml (78%) rename NeoUI/{NeoUI => Melskin}/Controls/Spin.xaml.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/SplashWindow/Border.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/SplashWindow/MathHelper.cs (86%) rename NeoUI/{NeoUI => Melskin}/Controls/SplashWindow/Splash.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/SplashWindow/SplashConfig.cs (80%) rename NeoUI/{NeoUI => Melskin}/Controls/SplashWindow/SplashWindow.xaml (93%) rename NeoUI/{NeoUI => Melskin}/Controls/SplashWindow/SplashWindow.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/StatusBar.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Controls/TabControl.xaml (63%) rename NeoUI/{NeoUI => Melskin}/Controls/Tag.xaml (84%) rename NeoUI/{NeoUI => Melskin}/Controls/Tag.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/TextBox.xaml (81%) rename NeoUI/{NeoUI => Melskin}/Controls/TextBoxContextMenu.xaml (86%) rename NeoUI/{NeoUI => Melskin}/Controls/TimePicker.xaml (83%) rename NeoUI/{NeoUI => Melskin}/Controls/TimePicker.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/IToastHost.cs (81%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/IToastService.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/ScreenHost.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/Toast.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/ToastControl.xaml (87%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/ToastControl.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/ToastManager.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/ToastType.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/Toast/WindowHost.cs (98%) rename NeoUI/{NeoUI => Melskin}/Controls/ToggleButton.xaml (72%) rename NeoUI/{NeoUI => Melskin}/Controls/ToggleSwitch.xaml (77%) rename NeoUI/{NeoUI => Melskin}/Controls/ToggleSwitch.xaml.cs (90%) rename NeoUI/{NeoUI => Melskin}/Controls/ToolBar.xaml (75%) create mode 100644 NeoUI/Melskin/Controls/ToolTip.xaml rename NeoUI/{NeoUI => Melskin}/Controls/TreeGrid.xaml (93%) rename NeoUI/{NeoUI => Melskin}/Controls/TreeGrid.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/TreeView.xaml (79%) rename NeoUI/{NeoUI => Melskin}/Controls/UploadArea.xaml (89%) rename NeoUI/{NeoUI => Melskin}/Controls/UploadArea.xaml.cs (99%) rename NeoUI/{NeoUI => Melskin}/Controls/Variant.cs (94%) rename NeoUI/{NeoUI => Melskin}/Controls/VistaFolderBrowserDialog.cs (99%) rename NeoUI/{NeoUI => Melskin}/Converters/BooleanConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/BooleanToVisibilityConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/ComparisionConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/ComparisionToVisibilityConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/DivideByTwoConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/AlphaToPercentConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/ColorToHexConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/ColorToOpaqueColorConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/CreateSlotClipGeometryConverter.cs (99%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/DoubleToCornerRadiusConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/HasChildrenMultiConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/HueToBrushConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/HueToColorConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToEmbossBlurConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToEmbossMarginLeftTopConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToEmbossMarginRightBottomConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToSlotBlurConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToSlotLightMarginConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToSlotMarginConverter.cs (94%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IntensityToSlotShadowMarginConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/InterlacedBackgroundConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/InverseOpacityConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/IsLastItemConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/PropertyValueConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/StringToCodeConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/StringToMarkDownConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/SymbolToCharConverter.cs (94%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/ThumbPositionConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Converters/Internal/ValueToRangeWidthConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/InvertBooleanConverter.cs (96%) rename NeoUI/{NeoUI => Melskin}/Converters/NullOrEmptyConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/PercentageConverter.cs (97%) rename NeoUI/{NeoUI => Melskin}/Converters/StringMatchConverter.cs (98%) rename NeoUI/{NeoUI => Melskin}/Effects/BrightnessContrastEffect.cs (98%) rename NeoUI/{NeoUI => Melskin}/Effects/LightedSurfaceEffect.cs (98%) rename NeoUI/{NeoUI => Melskin}/Extensions/StringExtensions.cs (95%) rename NeoUI/{NeoUI => Melskin}/Extensions/VisualExtensions.cs (99%) rename NeoUI/{NeoUI => Melskin}/GlobalUsings.cs (100%) rename NeoUI/{NeoUI => Melskin}/Layout/FlexibleRowPanel.cs (99%) rename NeoUI/{NeoUI => Melskin}/Layout/Grid.cs (99%) rename NeoUI/{NeoUI => Melskin}/Layout/StackPanel.cs (99%) rename NeoUI/{NeoUI => Melskin}/Layout/TableGrid.cs (99%) rename NeoUI/{NeoUI => Melskin}/Layout/UniformGrid.cs (99%) rename NeoUI/{NeoUI => Melskin}/Layout/WaterfallPanel.cs (99%) rename NeoUI/{NeoUI => Melskin}/Layout/WrapPanel.cs (99%) rename NeoUI/{NeoUI => Melskin}/Markup/EnumSourceExtension.cs (99%) rename NeoUI/{NeoUI => Melskin}/Markup/IconExtension.cs (97%) rename NeoUI/{NeoUI => Melskin}/Markup/SymbolIconExtension.cs (97%) create mode 100644 NeoUI/Melskin/Melskin.csproj rename NeoUI/{NeoUI => Melskin}/Properties/AssemblyInfo.cs (52%) rename NeoUI/{NeoUI => Melskin}/Resources/Tools/EffectShaderCompiler.exe (100%) rename NeoUI/{NeoUI => Melskin}/Resources/Tools/Resources/fxc.exe (100%) rename NeoUI/{NeoUI => Melskin}/Shaders/BrightnessContrastEffect.hlsl (100%) rename NeoUI/{NeoUI => Melskin}/Shaders/BrightnessContrastEffect.ps (100%) rename NeoUI/{NeoUI => Melskin}/Shaders/CompileEffect.bat (100%) rename NeoUI/{NeoUI => Melskin}/Shaders/LightedSurfaceEffect.hlsl (100%) rename NeoUI/{NeoUI => Melskin}/Shaders/LightedSurfaceEffect.ps (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Accents/DarkBlue.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Accents/DarkGreen.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Accents/DarkPurple.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Accents/LightBlue.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Accents/LightGreen.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Accents/LightPurple.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Animations.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Dark.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Fonts.xaml (77%) rename NeoUI/{NeoUI => Melskin}/Themes/Generic.xaml (60%) rename NeoUI/{NeoUI => Melskin}/Themes/Light.xaml (100%) rename NeoUI/{NeoUI => Melskin}/Themes/Metrics.xaml (100%) create mode 100644 NeoUI/Melskin/Themes/Styles.xaml rename NeoUI/{NeoUI => Melskin}/Utilities/RelayCommand.cs (99%) rename NeoUI/{NeoUITest => MelskinTest}/App.xaml (75%) rename NeoUI/{NeoUITest => MelskinTest}/App.xaml.cs (93%) rename NeoUI/{NeoUITest => MelskinTest}/ColorPaletteControl.xaml (98%) rename NeoUI/{NeoUITest => MelskinTest}/ColorPaletteControl.xaml.cs (99%) rename NeoUI/{NeoUITest => MelskinTest}/ColorPaletteWindow.xaml (67%) rename NeoUI/{NeoUITest => MelskinTest}/ColorPaletteWindow.xaml.cs (95%) rename NeoUI/{NeoUITest => MelskinTest}/ControlTestWindow.xaml (97%) rename NeoUI/{NeoUITest => MelskinTest}/ControlTestWindow.xaml.cs (99%) rename NeoUI/{NeoUITest => MelskinTest}/DataModel/DataGridItem.cs (98%) rename NeoUI/{NeoUITest => MelskinTest}/DataModel/TreeItemData.cs (84%) rename NeoUI/{NeoUITest => MelskinTest}/IconsWindow.xaml (98%) rename NeoUI/{NeoUITest => MelskinTest}/IconsWindow.xaml.cs (98%) rename NeoUI/{NeoUITest => MelskinTest}/MainWindow.xaml (99%) rename NeoUI/{NeoUITest => MelskinTest}/MainWindow.xaml.cs (99%) create mode 100644 NeoUI/MelskinTest/MelskinTest.csproj rename NeoUI/{NeoUITest => MelskinTest}/NeumorphismWindow.xaml (99%) rename NeoUI/{NeoUITest => MelskinTest}/NeumorphismWindow.xaml.cs (95%) rename NeoUI/{NeoUITest => MelskinTest}/Properties/AssemblyInfo.cs (100%) rename NeoUI/{NeoUITest => MelskinTest}/Resources/Images/ImageTest.png (100%) rename NeoUI/{NeoUITest => MelskinTest}/Resources/Images/image.png (100%) rename NeoUI/{NeoUITest => MelskinTest}/Resources/Images/image.webp (100%) rename NeoUI/{NeoUITest => MelskinTest}/ViewModel.cs (98%) delete mode 100644 NeoUI/NeoUI/Controls/ToolTip.xaml delete mode 100644 NeoUI/NeoUI/Themes/Styles.xaml create mode 100644 NeoUI/VariaStudio/VariaStudio.csproj create mode 100644 NeoUI/VariaStudioTest/VariaStudioTest.csproj diff --git a/NeoUI/NeoUI/Appearance/ControlsDictionary.cs b/NeoUI/Melskin/Appearance/ControlsDictionary.cs similarity index 97% rename from NeoUI/NeoUI/Appearance/ControlsDictionary.cs rename to NeoUI/Melskin/Appearance/ControlsDictionary.cs index 6defdc7..d8e7eef 100644 --- a/NeoUI/NeoUI/Appearance/ControlsDictionary.cs +++ b/NeoUI/Melskin/Appearance/ControlsDictionary.cs @@ -1,6 +1,6 @@ using System.Windows.Markup; -namespace NeoUI.Appearance; +namespace VariaStudio.Appearance; /// /// ControlsDictionary 类继承自 ResourceDictionary，用于定义和管理控件相关的样式资源。 diff --git a/NeoUI/NeoUI/Appearance/ThemeManager.cs b/NeoUI/Melskin/Appearance/ThemeManager.cs similarity index 99% rename from NeoUI/NeoUI/Appearance/ThemeManager.cs rename to NeoUI/Melskin/Appearance/ThemeManager.cs index ad1129f..9953a12 100644 --- a/NeoUI/NeoUI/Appearance/ThemeManager.cs +++ b/NeoUI/Melskin/Appearance/ThemeManager.cs @@ -4,7 +4,7 @@ using System.IO; using System.Reflection; using System.Windows.Media.Animation; -namespace NeoUI.Appearance +namespace VariaStudio.Appearance { /// /// 统一主题管理（合并原 ThemeManager + AppearanceManager 功能）。 diff --git a/NeoUI/NeoUI/Appearance/ThemeMode.cs b/NeoUI/Melskin/Appearance/ThemeMode.cs similarity index 95% rename from NeoUI/NeoUI/Appearance/ThemeMode.cs rename to NeoUI/Melskin/Appearance/ThemeMode.cs index 567a2a0..773b660 100644 --- a/NeoUI/NeoUI/Appearance/ThemeMode.cs +++ b/NeoUI/Melskin/Appearance/ThemeMode.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace NeoUI.Appearance; +namespace VariaStudio.Appearance; /// /// 明暗模式切换 /// diff --git a/NeoUI/NeoUI/Appearance/ThemePreferenceStore.cs b/NeoUI/Melskin/Appearance/ThemePreferenceStore.cs similarity index 98% rename from NeoUI/NeoUI/Appearance/ThemePreferenceStore.cs rename to NeoUI/Melskin/Appearance/ThemePreferenceStore.cs index e189a3e..942b9ea 100644 --- a/NeoUI/NeoUI/Appearance/ThemePreferenceStore.cs +++ b/NeoUI/Melskin/Appearance/ThemePreferenceStore.cs @@ -1,6 +1,6 @@ using System.IO; -namespace NeoUI.Appearance +namespace VariaStudio.Appearance { /// /// 主题偏好存储：简单文本文件：第一行 ThemeMode，第二行 ThemePalette diff --git a/NeoUI/NeoUI/Appearance/ThemesDictionary.cs b/NeoUI/Melskin/Appearance/ThemesDictionary.cs similarity index 94% rename from NeoUI/NeoUI/Appearance/ThemesDictionary.cs rename to NeoUI/Melskin/Appearance/ThemesDictionary.cs index 4ebc9df..7d943c8 100644 --- a/NeoUI/NeoUI/Appearance/ThemesDictionary.cs +++ b/NeoUI/Melskin/Appearance/ThemesDictionary.cs @@ -2,7 +2,7 @@ using System.Windows.Markup; -namespace NeoUI.Appearance; +namespace VariaStudio.Appearance; /// /// 提供字典实现，该字典通过合并一个“模式”字典和一个依赖于模式的“调色板”字典来动态构建完整的主题。 @@ -59,7 +59,7 @@ public class ThemesDictionary : ResourceDictionary // 更新 Mode 字典 (只要 Mode 有值就更新) if (currentMode.HasValue) { - // 路径示例: /NeoUI;component/Appearance/Themes/Dark.xaml + // 路径示例: /VariaStudio;component/Appearance/Themes/Dark.xaml var modeSourceUri = new Uri($"{ThemeManager.ThemesDictionaryPath}{currentMode.Value}.xaml", UriKind.RelativeOrAbsolute); if (modeDictionary.Source != modeSourceUri) { @@ -71,7 +71,7 @@ public class ThemesDictionary : ResourceDictionary if (currentMode.HasValue && currentPalette.HasValue) { var paletteName = $"{currentMode.Value}{currentPalette.Value}"; - // 路径示例: /NeoUI;component/Appearance/Themes/Accents/DarkGreen.xaml + // 路径示例: /VariaStudio;component/Appearance/Themes/Accents/DarkGreen.xaml var paletteSourceUri = new Uri($"{ThemeManager.ThemesDictionaryPath}Accents/{paletteName}.xaml", UriKind.RelativeOrAbsolute); if (paletteDictionary.Source != paletteSourceUri) { diff --git a/NeoUI/NeoUI/Assets/MaterialSymbol.cs b/NeoUI/Melskin/Assets/MaterialSymbol.cs similarity index 99% rename from NeoUI/NeoUI/Assets/MaterialSymbol.cs rename to NeoUI/Melskin/Assets/MaterialSymbol.cs index 1526d5f..e5d28ac 100644 --- a/NeoUI/NeoUI/Assets/MaterialSymbol.cs +++ b/NeoUI/Melskin/Assets/MaterialSymbol.cs @@ -1,5 +1,5 @@ #pragma warning disable CS1591 -namespace NeoUI.Assets; +namespace VariaStudio.Assets; public enum MaterialSymbol { diff --git a/NeoUI/NeoUI/Assets/MaterialSymbols.xaml b/NeoUI/Melskin/Assets/MaterialSymbols.xaml similarity index 100% rename from NeoUI/NeoUI/Assets/MaterialSymbols.xaml rename to NeoUI/Melskin/Assets/MaterialSymbols.xaml diff --git a/NeoUI/NeoUI/Assets/MaterialSymbolsRounded-Regular.ttf b/NeoUI/Melskin/Assets/MaterialSymbolsRounded-Regular.ttf similarity index 100% rename from NeoUI/NeoUI/Assets/MaterialSymbolsRounded-Regular.ttf rename to NeoUI/Melskin/Assets/MaterialSymbolsRounded-Regular.ttf diff --git a/NeoUI/NeoUI/Assists/BehaviorAssist.cs b/NeoUI/Melskin/Assists/BehaviorAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/BehaviorAssist.cs rename to NeoUI/Melskin/Assists/BehaviorAssist.cs index 4bf93db..7627ffb 100644 --- a/NeoUI/NeoUI/Assists/BehaviorAssist.cs +++ b/NeoUI/Melskin/Assists/BehaviorAssist.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media.Animation; -using NeoUI.Controls; -using NeoUI.Extensions; +using VariaStudio.Extensions; +using VariaStudio.Controls; -namespace NeoUI.Assists +namespace VariaStudio.Assists { /// /// 控件行为的附加属性类 diff --git a/NeoUI/NeoUI/Assists/BindingProxy.cs b/NeoUI/Melskin/Assists/BindingProxy.cs similarity index 96% rename from NeoUI/NeoUI/Assists/BindingProxy.cs rename to NeoUI/Melskin/Assists/BindingProxy.cs index 70036d6..dff7268 100644 --- a/NeoUI/NeoUI/Assists/BindingProxy.cs +++ b/NeoUI/Melskin/Assists/BindingProxy.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace NeoUI.Assists +namespace VariaStudio.Assists { /// /// 绑定代理，用来传递绑定对象 diff --git a/NeoUI/NeoUI/Assists/ColorAssist.cs b/NeoUI/Melskin/Assists/ColorAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/ColorAssist.cs rename to NeoUI/Melskin/Assists/ColorAssist.cs index 01751f2..6a9c2a3 100644 --- a/NeoUI/NeoUI/Assists/ColorAssist.cs +++ b/NeoUI/Melskin/Assists/ColorAssist.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Controls.Primitives; -using NeoUI.Controls; +using VariaStudio.Controls; -namespace NeoUI.Assists +namespace VariaStudio.Assists { /// /// 颜色辅助类，提供了一组附加属性，用于在WPF应用程序中为控件设置和获取各种颜色相关的属性，如标题栏背景色、鼠标悬停颜色、聚焦颜色和按下状态颜色等。 diff --git a/NeoUI/NeoUI/Assists/ControlAssist.cs b/NeoUI/Melskin/Assists/ControlAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/ControlAssist.cs rename to NeoUI/Melskin/Assists/ControlAssist.cs index 46ffb24..b0df2e4 100644 --- a/NeoUI/NeoUI/Assists/ControlAssist.cs +++ b/NeoUI/Melskin/Assists/ControlAssist.cs @@ -1,8 +1,8 @@  using System.Windows.Controls.Primitives; -using NeoUI.Controls; +using VariaStudio.Controls; -namespace NeoUI.Assists; +namespace VariaStudio.Assists; using System.ComponentModel; using System.Windows; diff --git a/NeoUI/NeoUI/Assists/DataGridAssist.cs b/NeoUI/Melskin/Assists/DataGridAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/DataGridAssist.cs rename to NeoUI/Melskin/Assists/DataGridAssist.cs index 2ca6b4a..8d0aade 100644 --- a/NeoUI/NeoUI/Assists/DataGridAssist.cs +++ b/NeoUI/Melskin/Assists/DataGridAssist.cs @@ -1,4 +1,4 @@ -namespace NeoUI.Assists; +namespace VariaStudio.Assists; //https://stackoverflow.com/questions/2630292/why-cant-i-style-a-datagridtextcolumn /// diff --git a/NeoUI/NeoUI/Assists/InputAssist.cs b/NeoUI/Melskin/Assists/InputAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/InputAssist.cs rename to NeoUI/Melskin/Assists/InputAssist.cs index f9f8088..9504e46 100644 --- a/NeoUI/NeoUI/Assists/InputAssist.cs +++ b/NeoUI/Melskin/Assists/InputAssist.cs @@ -1,8 +1,8 @@ using System.Windows.Controls.Primitives; -using NeoUI.Extensions; +using VariaStudio.Extensions; -namespace NeoUI.Assists; +namespace VariaStudio.Assists; /// /// InputAssist 类提供了一系列附加属性，用于增强 WPF 应用程序中输入控件的功能。这些功能包括设置占位符文本、占位符颜色、前缀和后缀内容等，支持 TextBoxBase、PasswordBox 和 ComboBox 控件。 diff --git a/NeoUI/NeoUI/Assists/ShadingAssist.cs b/NeoUI/Melskin/Assists/ShadingAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/ShadingAssist.cs rename to NeoUI/Melskin/Assists/ShadingAssist.cs index 507d810..2650685 100644 --- a/NeoUI/NeoUI/Assists/ShadingAssist.cs +++ b/NeoUI/Melskin/Assists/ShadingAssist.cs @@ -1,4 +1,4 @@ -namespace NeoUI.Assists; +namespace VariaStudio.Assists; /// /// ShadingAssist 类提供了一种方式，用于通过依赖属性来设置UI元素的阴影和高亮效果。此类允许开发者为指定的UI元素定义光刷、暗刷、禁用背景色、禁用前景色以及高亮边框颜色。 diff --git a/NeoUI/NeoUI/Assists/TabAssist.cs b/NeoUI/Melskin/Assists/TabAssist.cs similarity index 99% rename from NeoUI/NeoUI/Assists/TabAssist.cs rename to NeoUI/Melskin/Assists/TabAssist.cs index 428a04a..72dea93 100644 --- a/NeoUI/NeoUI/Assists/TabAssist.cs +++ b/NeoUI/Melskin/Assists/TabAssist.cs @@ -1,4 +1,4 @@ -namespace NeoUI.Assists; +namespace VariaStudio.Assists; /// /// TabAssist 类用于在 WPF 应用程序中为 TabControl 提供附加功能。通过依赖属性 UseFadeIn，可以控制选项卡切换时是否启用渐变浮现效果。 diff --git a/NeoUI/NeoUI/Controls/Accordion.xaml b/NeoUI/Melskin/Controls/Accordion.xaml similarity index 91% rename from NeoUI/NeoUI/Controls/Accordion.xaml rename to NeoUI/Melskin/Controls/Accordion.xaml index b37fc2c..277bf86 100644 --- a/NeoUI/NeoUI/Controls/Accordion.xaml +++ b/NeoUI/Melskin/Controls/Accordion.xaml @@ -1,14 +1,14 @@  + xmlns:assists="clr-namespace:VariaStudio.Assists" + xmlns:controls="clr-namespace:VariaStudio.Controls" + xmlns:decorations="clr-namespace:VariaStudio.Controls.Decorations" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - + - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NeoUI/NeoUI/Controls/Card.xaml b/NeoUI/Melskin/Controls/Card.xaml similarity index 84% rename from NeoUI/NeoUI/Controls/Card.xaml rename to NeoUI/Melskin/Controls/Card.xaml index 6997e4c..f748a0e 100644 --- a/NeoUI/NeoUI/Controls/Card.xaml +++ b/NeoUI/Melskin/Controls/Card.xaml @@ -1,8 +1,8 @@  + xmlns:controls="clr-namespace:VariaStudio.Controls" + xmlns:decorations="clr-namespace:VariaStudio.Controls.Decorations" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - diff --git a/NeoUI/NeoUI/Controls/CheckableTag.xaml b/NeoUI/Melskin/Controls/CheckableTag.xaml similarity index 89% rename from NeoUI/NeoUI/Controls/CheckableTag.xaml rename to NeoUI/Melskin/Controls/CheckableTag.xaml index 6c4299d..8847e17 100644 --- a/NeoUI/NeoUI/Controls/CheckableTag.xaml +++ b/NeoUI/Melskin/Controls/CheckableTag.xaml @@ -1,11 +1,11 @@  + xmlns:controls="clr-namespace:VariaStudio.Controls" + xmlns:helpers="clr-namespace:VariaStudio.Assists" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - + - - - - + + - + + VerticalOffset="4" + x:Name="PART_Popup"> - - + CornerRadius="4" + Margin="8" + MaxHeight="{TemplateBinding MaxDropDownHeight}" + MinWidth="{Binding ActualWidth, ElementName=templateRoot}" + x:Name="dropDownBorder"> + + + VerticalAlignment="Top" + Width="0" + x:Name="canvas"> + Width="{Binding ActualWidth, ElementName=dropDownBorder}" + x:Name="opaqueRect" /> + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" + x:Name="ItemsPresenter" /> + Margin="-4" + Style="{StaticResource FloatComboBoxToggleButton}" + x:Name="toggleButton" /> + x:Name="PART_EditableTextBox" /> + x:Name="Placeholder"> - - - + + - + + VerticalOffset="4" + x:Name="PART_Popup"> - - + CornerRadius="4" + Margin="8" + MaxHeight="{TemplateBinding MaxDropDownHeight}" + MinWidth="{Binding ActualWidth, ElementName=templateRoot}" + x:Name="dropDownBorder"> + + + VerticalAlignment="Top" + Width="0" + x:Name="canvas"> + Width="{Binding ActualWidth, ElementName=dropDownBorder}" + x:Name="opaqueRect" /> + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" + x:Name="ItemsPresenter" /> + Style="{StaticResource ComboBoxToggleButton}" + x:Name="toggleButton" /> + x:Name="PART_EditableTextBox" /> + IsHitTestVisible="False" + Margin="{TemplateBinding BorderThickness}"> - + + HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" + Margin="2,0,0,0" + Text="{Binding Path=(assists:InputAssist.PlaceholderText), RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ComboBox}}" + VerticalAlignment="{TemplateBinding VerticalContentAlignment}" + x:Name="Placeholder"> - - + + - + + VerticalOffset="4" + x:Name="PART_Popup"> - - + CornerRadius="4" + Margin="8" + MaxHeight="{TemplateBinding MaxDropDownHeight}" + MinWidth="{Binding ActualWidth, ElementName=templateRoot}" + x:Name="dropDownBorder"> + + + VerticalAlignment="Top" + Width="0" + x:Name="canvas"> + Width="{Binding ActualWidth, ElementName=dropDownBorder}" + x:Name="opaqueRect" /> + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" + x:Name="ItemsPresenter" /> - + + Margin="{TemplateBinding Padding}" + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" + VerticalAlignment="{TemplateBinding VerticalContentAlignment}" + x:Name="contentPresenter" /> - - + + - + @@ -929,18 +929,18 @@ - - - + + + - - - - - - - - - - + x:Name="PART_Root"> + Grid.Column="0" + Grid.Row="0" + HorizontalContentAlignment="Left" + Style="{StaticResource DefaultTextBoxDatePickerStyle}" + VerticalAlignment="Stretch" + VerticalContentAlignment="Center" + x:Name="PART_TextBox" /> + Width="40" /> -