From 7bab4cd61a56de2e6382ef93834ebc029759469b Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sun, 9 Aug 2020 16:32:08 +0800 Subject: [PATCH] add Loading doc --- .../extend_controls/imageBrowser/index.md | 26 ++++++++- .../extend_controls/imageViewer/index.md | 29 +++++++++- .../extend_controls/loading/index.md | 53 ++++++++++++++++++- .../next/source/css/_custom/custom.styl | 12 +++++ .../Controls/Input/DateTimePicker.cs | 2 +- .../Controls/Input/TimePicker.cs | 2 +- .../Controls/Loading/LoadingCircle.cs | 2 +- .../Controls/Other/AnimationPath.cs | 2 +- .../Interactivity/TriggerAction.cs | 2 +- 9 files changed, 119 insertions(+), 11 deletions(-) diff --git a/doc/source/handycontrol/extend_controls/imageBrowser/index.md b/doc/source/handycontrol/extend_controls/imageBrowser/index.md index ca12ad62..938b3974 100644 --- a/doc/source/handycontrol/extend_controls/imageBrowser/index.md +++ b/doc/source/handycontrol/extend_controls/imageBrowser/index.md @@ -1,5 +1,27 @@ --- -title: 建设中 +title: ImageBrowser 图片浏览器 --- -建设中 \ No newline at end of file +可借助 `ImageBrowser` 简单地浏览单张图片. + +```cs +public class ImageBrowser : Window +``` + +# 案例 + +构造函数传入图片地址后即可开始浏览图片: + +```cs +new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show() +``` + +![ImageBrowser](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageBrowser.gif) + +# 功能 + +功能面板截图如下： + +![ImageBrowser](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/ImageBrowser_1.png) + +从左到右功能依次为：`保存至本地`、`使用系统默认程序打开该图片`、`缩小图片`、`放大图片`、`原始大小`、`左转图片`、`右转图片`. \ No newline at end of file diff --git a/doc/source/handycontrol/extend_controls/imageViewer/index.md b/doc/source/handycontrol/extend_controls/imageViewer/index.md index ca12ad62..746f4557 100644 --- a/doc/source/handycontrol/extend_controls/imageViewer/index.md +++ b/doc/source/handycontrol/extend_controls/imageViewer/index.md @@ -1,5 +1,30 @@ --- -title: 建设中 +title: ImageViewer 图片视图 --- -建设中 \ No newline at end of file +`ImageViewer` 是 `ImageBrowser` 的核心构件，它可以作为独立的控件使用，无需弹窗。 + +```cs +[TemplatePart(Name = ElementPanelMain, Type = typeof(Panel))] +[TemplatePart(Name = ElementCanvasSmallImg, Type = typeof(Canvas))] +[TemplatePart(Name = ElementBorderMove, Type = typeof(Border))] +[TemplatePart(Name = ElementBorderBottom, Type = typeof(Border))] +[TemplatePart(Name = ElementImageMain, Type = typeof(Image))] +public class ImageViewer : Control +``` + +# 属性 + +|属性|描述|默认值|备注| +|-|-|-|-| +|ShowImgMap|是否显示小地图|false|| +|ImageSource|图片资源||| +|IsFullScreen|是否处于全屏显示中|false||| + +# 案例 + +```xml + +``` + +![ImageViewer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Doc/extend_controls/ImageViewer_1.png) \ No newline at end of file diff --git a/doc/source/handycontrol/extend_controls/loading/index.md b/doc/source/handycontrol/extend_controls/loading/index.md index ca12ad62..acae0f87 100644 --- a/doc/source/handycontrol/extend_controls/loading/index.md +++ b/doc/source/handycontrol/extend_controls/loading/index.md @@ -1,5 +1,54 @@ --- -title: 建设中 +title: Loading 加载条 --- -建设中 \ No newline at end of file +耗时操作时显示动效，目前包含圆形和直线两种加载条。相关博文：[《WPF 控件库——仿制Windows10的进度条》](https://www.cnblogs.com/nabian/p/9288576.html) + +```cs +public abstract class LoadingBase : ContentControl +``` + +```cs +public class LoadingLine : LoadingBase +``` + +```cs +public class LoadingCircle : LoadingBase +``` + +# LoadingBase 属性 + +|属性|描述|默认值|备注| +|-|-|-|-| +|IsRunning|是否处于加载|true|| +|DotCount|圆点数目|5|| +|DotInterval|圆点间隙|10|| +|DotBorderBrush|圆点边框颜色||| +|DotBorderThickness|圆点边框粗细|0|| +|DotDiameter|圆点半径|6|| +|DotSpeed|一遍循环所用时间|4s|| +|DotDelayTime|各点的动画延迟|80ms||| + +# LoadingCircle 属性 + +|属性|描述|默认值|备注| +|-|-|-|-| +|DotOffSet|圆点偏移|20|| +|NeedHidden|圆点运动中途是否需要隐藏|true||| + +# 案例 + +```xml + + + + + + + + + + +``` + +![Loading](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Loading.gif) \ No newline at end of file diff --git a/doc/themes/next/source/css/_custom/custom.styl b/doc/themes/next/source/css/_custom/custom.styl index 371e0204..b8b20499 100644 --- a/doc/themes/next/source/css/_custom/custom.styl +++ b/doc/themes/next/source/css/_custom/custom.styl @@ -1,4 +1,16 @@ // Custom styles. + +.container:before{ + content: ""; + opacity: 0.1; + top: 0; + left: 0; + bottom: 0; + right: 0; + position: absolute; + z-index: -1; + background: url(https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/cloud.png); +} .posts-expand .post-body img { margin: 3px; display: inline; diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs index 0f7156d4..2379474d 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs @@ -74,7 +74,7 @@ namespace HandyControl.Controls { EventManager.RegisterClassHandler(typeof(DateTimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus)); KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once)); - KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(false)); + KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox)); } public DateTimePicker() diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs index 066228a4..249f4746 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs @@ -72,7 +72,7 @@ namespace HandyControl.Controls { EventManager.RegisterClassHandler(typeof(TimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus)); KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once)); - KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(false)); + KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox)); } public TimePicker() diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs index 21b6eb1d..40df8bfd 100644 --- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs +++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs @@ -23,7 +23,7 @@ namespace HandyControl.Controls public static readonly DependencyProperty NeedHiddenProperty = DependencyProperty.Register( "NeedHidden", typeof(bool), typeof(LoadingCircle), - new FrameworkPropertyMetadata(true, FrameworkPropertyMetadataOptions.AffectsRender)); + new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender)); public bool NeedHidden { diff --git a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs index c6874b34..b8580bde 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs @@ -80,7 +80,7 @@ namespace HandyControl.Controls } public static readonly DependencyProperty IsPlayingProperty = DependencyProperty.Register( - "IsPlaying", typeof(bool), typeof(AnimationPath), new FrameworkPropertyMetadata(true, (o, args) => + "IsPlaying", typeof(bool), typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, (o, args) => { var ctl = (AnimationPath)o; var v = (bool)args.NewValue; diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs index ed18ba45..1a36f453 100644 --- a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs +++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs @@ -12,7 +12,7 @@ namespace HandyControl.Interactivity public abstract class TriggerAction : Animatable, IAttachedObject { public static readonly DependencyProperty IsEnabledProperty = DependencyProperty.Register("IsEnabled", - typeof(bool), typeof(TriggerAction), new FrameworkPropertyMetadata(true)); + typeof(bool), typeof(TriggerAction), new FrameworkPropertyMetadata(ValueBoxes.TrueBox)); private readonly Type _associatedObjectTypeConstraint;