From 955894e2656cbbe6b01e22d6be4f704adf2e2191 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 6 Feb 2020 23:00:43 +0800 Subject: [PATCH] add FlowDocumentReader Style --- .../index.md | 12 +- doc/themes/next/_config.yml | 2 +- .../Properties/Langs/Lang.Designer.cs | 9 + .../Properties/Langs/Lang.en.resx | 3 + .../Properties/Langs/Lang.fa.resx | 3 + .../Properties/Langs/Lang.fr.resx | 3 + .../Properties/Langs/Lang.ko-KR.resx | 3 + .../Properties/Langs/Lang.resx | 3 + .../Styles/FlowDocumentDemoCtl.xaml | 284 ++++++------------ .../Properties/Langs/Lang.Designer.cs | 36 +++ .../Properties/Langs/Lang.en.resx | 12 + .../Properties/Langs/Lang.fa.resx | 12 + .../Properties/Langs/Lang.fr.resx | 12 + .../Properties/Langs/Lang.ko-KR.resx | 12 + .../Properties/Langs/Lang.resx | 12 + .../Themes/Basic/Geometries.xaml | 3 + .../Themes/Styles/Base/ButtonBaseStyle.xaml | 12 +- .../Styles/Base/FlowDocumentBaseStyle.xaml | 89 +++++- .../Styles/Base/RadioButtonBaseStyle.xaml | 12 +- .../Styles/Base/ToggleButtonBaseStyle.xaml | 16 +- .../Themes/Styles/FlowDocument.xaml | 2 + 21 files changed, 355 insertions(+), 197 deletions(-) rename doc/source/handycontrol/native_controls/{flowDocumentScrollViewer => flowDocument}/index.md (95%) diff --git a/doc/source/handycontrol/native_controls/flowDocumentScrollViewer/index.md b/doc/source/handycontrol/native_controls/flowDocument/index.md similarity index 95% rename from doc/source/handycontrol/native_controls/flowDocumentScrollViewer/index.md rename to doc/source/handycontrol/native_controls/flowDocument/index.md index eaa3193e..24ea90d6 100644 --- a/doc/source/handycontrol/native_controls/flowDocumentScrollViewer/index.md +++ b/doc/source/handycontrol/native_controls/flowDocument/index.md @@ -1,5 +1,5 @@ --- -title: FlowDocumentScrollViewer 流文档滚动视图 +title: FlowDocument 流文档 --- # FlowDocumentScrollViewerBaseStyle @@ -106,4 +106,12 @@ title: FlowDocumentScrollViewer 流文档滚动视图 效果： -![FlowDocumentScrollViewer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png) \ No newline at end of file +![FlowDocumentScrollViewer](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/FlowDocumentScrollViewer.png) + +# FlowDocumentPageViewerBaseStyle + +流文档单页视图默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 + +# FlowDocumentReaderBaseStyle + +流文档查看器默认样式，不推荐直接使用，应该始终被其它样式以BasedOn的方式使用。 \ No newline at end of file diff --git a/doc/themes/next/_config.yml b/doc/themes/next/_config.yml index 133eb9d1..757820ce 100644 --- a/doc/themes/next/_config.yml +++ b/doc/themes/next/_config.yml @@ -203,7 +203,7 @@ menu: DataGrid 数据表格: /dataGrid/ || DatePicker 日期选择器: /datePicker/ || Expander 展开框: /expander/ || - FlowDocumentScrollViewer 流文档滚动视图: /flowDocumentScrollViewer/ || + FlowDocument 流文档: /flowDocument/ || GroupBox 分组框: /groupBox/ || Image 图片: /image/ || Label 标签: /label/ || diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index cc031730..d41135ab 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -645,6 +645,15 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 流文档查看器 的本地化字符串。 + /// + public static string FlowDocumentReader { + get { + return ResourceManager.GetString("FlowDocumentReader", resourceCulture); + } + } + /// /// 查找类似 流文档滚动视图 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index 35963e07..66f349a4 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -726,4 +726,7 @@ FlowDocumentPageViewer + + FlowDocumentReader + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 618f3d54..70d48452 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -726,4 +726,7 @@ FlowDocumentPageViewer + + FlowDocumentReader + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index 120fcaa5..9adf6fa6 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -726,4 +726,7 @@ FlowDocumentPageViewer + + FlowDocumentReader + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx index ab47f5b9..da0a09d3 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -726,4 +726,7 @@ FlowDocumentPageViewer + + FlowDocumentReader + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx index 96577701..889477af 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -726,4 +726,7 @@ 流文档单页视图 + + 流文档查看器 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml index 3d41b56d..0ea4e6ce 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml @@ -4,197 +4,109 @@ xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs" Background="{DynamicResource RegionBrush}"> + + +
+ + Neptune (planet), major planet in the solar system, eighth planet + from the Sun and fourth largest in diameter. Neptune maintains an almost constant + distance, about 4,490 million km (about 2,790 million mi), from the Sun. Neptune + revolves outside the orbit of Uranus and for most of its orbit moves inside the + elliptical path of the outermost planet Pluto (see Solar System). Every 248 years, + Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit + for about 20 years, temporarily making Neptune the farthest planet from the Sun. + The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In + 1999 Pluto’s orbit carried it back outside Neptune’s orbit. +
+ + Neptune has 72 times Earth's volume... + +
+ + + + + + + + + + Neptune Stats + + + + + Mean Distance from Sun + + + 4,504,000,000 km + + + + + Mean Diameter + + + 49,532 km + + + + + Approximate Mass + + + 1.0247e26 kg + + + + + + Information from the + Encarta + web site. + + + + +
+ + + + Astronomers believe Neptune has an inner rocky core that is surrounded by a vast + ocean of water mixed with rocky material. From the inner core, this ocean extends + upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts + of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume + is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of + its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as + one of the giant or Jovian planets (so-called because they resemble Jupiter). + + +
+ + Neptune has an orbital period of ~20 years... + +
+ Mathematical theories of astronomy led to the discovery of Neptune. To account for + wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and + French astronomer Urbain Jean Joseph Leverrier independently calculated the existence + and position of a new planet in 1845 and 1846, respectively. They theorized that the + gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s + orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first + observed the planet in 1846. + +
+ + - - -
- - Neptune (planet), major planet in the solar system, eighth planet - from the Sun and fourth largest in diameter. Neptune maintains an almost constant - distance, about 4,490 million km (about 2,790 million mi), from the Sun. Neptune - revolves outside the orbit of Uranus and for most of its orbit moves inside the - elliptical path of the outermost planet Pluto (see Solar System). Every 248 years, - Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit - for about 20 years, temporarily making Neptune the farthest planet from the Sun. - The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In - 1999 Pluto’s orbit carried it back outside Neptune’s orbit. -
- - Neptune has 72 times Earth's volume... - -
- - - - - - - - - - Neptune Stats - - - - - Mean Distance from Sun - - - 4,504,000,000 km - - - - - Mean Diameter - - - 49,532 km - - - - - Approximate Mass - - - 1.0247e26 kg - - - - - - Information from the - Encarta - web site. - - - - -
- - - - Astronomers believe Neptune has an inner rocky core that is surrounded by a vast - ocean of water mixed with rocky material. From the inner core, this ocean extends - upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts - of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume - is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of - its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as - one of the giant or Jovian planets (so-called because they resemble Jupiter). - - -
- - Neptune has an orbital period of ~20 years... - -
- Mathematical theories of astronomy led to the discovery of Neptune. To account for - wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and - French astronomer Urbain Jean Joseph Leverrier independently calculated the existence - and position of a new planet in 1845 and 1846, respectively. They theorized that the - gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s - orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first - observed the planet in 1846. - -
- - + - - -
- - Neptune (planet), major planet in the solar system, eighth planet - from the Sun and fourth largest in diameter. Neptune maintains an almost constant - distance, about 4,490 million km (about 2,790 million mi), from the Sun. Neptune - revolves outside the orbit of Uranus and for most of its orbit moves inside the - elliptical path of the outermost planet Pluto (see Solar System). Every 248 years, - Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit - for about 20 years, temporarily making Neptune the farthest planet from the Sun. - The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In - 1999 Pluto’s orbit carried it back outside Neptune’s orbit. -
- - Neptune has 72 times Earth's volume... - -
- - - - - - - - - - Neptune Stats - - - - - Mean Distance from Sun - - - 4,504,000,000 km - - - - - Mean Diameter - - - 49,532 km - - - - - Approximate Mass - - - 1.0247e26 kg - - - - - - Information from the - Encarta - web site. - - - - -
- - - - Astronomers believe Neptune has an inner rocky core that is surrounded by a vast - ocean of water mixed with rocky material. From the inner core, this ocean extends - upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts - of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume - is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of - its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as - one of the giant or Jovian planets (so-called because they resemble Jupiter). - - -
- - Neptune has an orbital period of ~20 years... - -
- Mathematical theories of astronomy led to the discovery of Neptune. To account for - wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and - French astronomer Urbain Jean Joseph Leverrier independently calculated the existence - and position of a new planet in 1845 and 1846, respectively. They theorized that the - gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s - orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first - observed the planet in 1846. - -
- - + + + + diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs index 377beb26..528bdaf1 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs @@ -159,6 +159,15 @@ namespace HandyControl.Properties.Langs { } } + /// + /// 查找类似 查找 的本地化字符串。 + /// + public static string Find { + get { + return ResourceManager.GetString("Find", resourceCulture); + } + } + /// /// 查找类似 格式错误 的本地化字符串。 /// @@ -267,6 +276,15 @@ namespace HandyControl.Properties.Langs { } } + /// + /// 查找类似 页面模式 的本地化字符串。 + /// + public static string PageMode { + get { + return ResourceManager.GetString("PageMode", resourceCulture); + } + } + /// /// 查找类似 下午 的本地化字符串。 /// @@ -294,6 +312,15 @@ namespace HandyControl.Properties.Langs { } } + /// + /// 查找类似 滚动模式 的本地化字符串。 + /// + public static string ScrollMode { + get { + return ResourceManager.GetString("ScrollMode", resourceCulture); + } + } + /// /// 查找类似 提示 的本地化字符串。 /// @@ -312,6 +339,15 @@ namespace HandyControl.Properties.Langs { } } + /// + /// 查找类似 双页模式 的本地化字符串。 + /// + public static string TwoPageMode { + get { + return ResourceManager.GetString("TwoPageMode", resourceCulture); + } + } + /// /// 查找类似 未知 的本地化字符串。 /// diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx index cdffda74..fb6a62c5 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx @@ -216,4 +216,16 @@ Next page + + Page mode + + + Two page mode + + + Scroll mode + + + Find + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx index c2cb1f04..199a5a24 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx @@ -216,4 +216,16 @@ Next page + + Page mode + + + Two page mode + + + Scroll mode + + + Find + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx index 9b1b8080..d2a35067 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx @@ -216,4 +216,16 @@ Next page + + Page mode + + + Two page mode + + + Scroll mode + + + Find + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx index 94a94d12..8a824eee 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx @@ -216,4 +216,16 @@ Zoom out + + Page mode + + + Two page mode + + + Scroll mode + + + Find + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx index 34f459cb..0a741524 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx @@ -216,4 +216,16 @@ 上一页 + + 页面模式 + + + 双页模式 + + + 滚动模式 + + + 查找 + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml index 7d375239..23b11e82 100644 --- a/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Basic/Geometries.xaml @@ -23,6 +23,9 @@ M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z M0,4 L10,4 L10,5 L0,5 z M 0,2 3,5 8,0 + M1.0000002,12 L1.0000002,13 11,13 11,12 z M1.0000002,10 L1.0000002,11 11,11 11,10 z M1.0000002,8 L1.0000002,9 11,9 11,8 z M1.0000002,6 L1.0000002,7 11,7 11,6 z M1.0000002,4 L1.0000002,5 11,5 11,4 z M1.0000002,2 L1.0000002,3 11,3 11,2 z M0,0 L12,0 12,14 0,14 z + M8.99999988079071,12L8.99999988079071,13 13,13 13,12z M1,12L1,13 5,13 5,12z M9.00000011920929,10L9.00000011920929,11 13,11 13,10z M1,10L1,11 5,11 5,10z M9.00000011920929,8L9.00000011920929,9 13,9 13,8z M1,8L1,9 5,9 5,8z M9.00000011920929,6L9.00000011920929,7 13,7 13,6z M1,6L1,7 5,7 5,6z M9.00000011920929,4L9.00000011920929,5 13,5 13,4z M1,4L1,5 5,5 5,4z M8.99999988079071,2L8.99999988079071,3 13,3 13,2z M1,2L1,3 5,3 5,2z M7.99999994039536,0L14,0 14,14 7.99999994039536,14z M0,0L6,0 6,14 0,14z + M1,12L1,13 8,13 8,12z M1,10L1,11 8,11 8,10z M1,8L1,9 8,9 8,8z M1,6L1,7 8,7 8,6z M11.0000002384186,5L11.0000002384186,9 13,9 13,5z M1,4L1,5 8,5 8,4z M1,2L1,3 8,3 8,2z M10.0000000298023,0L14,0 14,14 10.0000000298023,14z M0,0L9.00000011920929,0 9.00000011920929,14 0,14z M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0 M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml index 7c76ac44..0dfa0351 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml @@ -61,12 +61,22 @@ - + + + + + + + + + + + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml index 7c69c960..58ca4a9a 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml @@ -21,7 +21,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -105,5 +105,88 @@ + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml index 26c893c6..9ca2f6f6 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml @@ -174,7 +174,10 @@ - + + + + @@ -185,6 +188,13 @@ + + + + + + + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml index 138ffd03..20b02675 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml @@ -11,7 +11,7 @@