Merge branch 'beta' of https://github.com/InkCanvasForClass/community into beta
This commit is contained in:
@@ -8,7 +8,7 @@ using System.Windows.Controls;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Threading;
|
||||
using Application = System.Windows.Application;
|
||||
using ui = iNKORE.UI.WPF.Modern.Controls;
|
||||
using ui = iNKORE.UI.WPF.Controls;
|
||||
|
||||
namespace Ink_Canvas
|
||||
{
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using Ink_Canvas.Helpers;
|
||||
using iNKORE.UI.WPF.Modern.Controls;
|
||||
using iNKORE.UI.WPF.Controls;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
@@ -4352,7 +4352,7 @@ namespace Ink_Canvas
|
||||
Text = "方案名称",
|
||||
Margin = new Thickness(0, 0, 0, 8)
|
||||
};
|
||||
var content = new iNKORE.UI.WPF.Modern.Controls.SimpleStackPanel { Spacing = 6 };
|
||||
var content = new iNKORE.UI.WPF.Controls.SimpleStackPanel { Spacing = 6 };
|
||||
content.Children.Add(label);
|
||||
content.Children.Add(input);
|
||||
var dialog = new iNKORE.UI.WPF.Modern.Controls.ContentDialog
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using Hardcodet.Wpf.TaskbarNotification;
|
||||
using Ink_Canvas.Helpers;
|
||||
using iNKORE.UI.WPF.Modern.Controls;
|
||||
using iNKORE.UI.WPF.Controls;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Windows;
|
||||
|
||||
Reference in New Issue
Block a user