From ec1ab849b6fc9b51daa5e2d290855a4d29aa5e41 Mon Sep 17 00:00:00 2001 From: ZouJin Date: Wed, 31 May 2023 02:51:53 +1000 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=96=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/VPet.Plugin.DemoClock.dll | Bin 38400 -> 38400 bytes VPet.Plugin.DemoClock/Setting.cs | 6 +++--- VPet.Plugin.DemoClock/TimeClock.xaml | 2 +- VPet.Plugin.DemoClock/TimeClock.xaml.cs | 2 +- VPet.Plugin.DemoClock/winSetting.xaml | 4 ++-- VPet.Plugin.DemoClock/winSetting.xaml.cs | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet.Plugin.DemoClock.dll b/VPet.Plugin.DemoClock/1100_DemoClock/plugin/VPet.Plugin.DemoClock.dll index 60c98d6db7663ad4fb25a09299f79b19114a0d01..ca6bf1d4165e6a9964ab61cf744f4401c5599c25 100644 GIT binary patch delta 4808 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 delta 4830 zcmcIo33O9c8vgHn$;;C0FE8C&(gwQG(n1SuL7@~Z%b=~LtraW=8X!U`4FxIH2`MVJ zvXu+6Iba>|$fAhB1I}SoX21a#mLrRb4&nkMO9jQ_pcdx8FA0s;aQS^Bg8|3Ig52{#=Bbt3}@9F#;1L|9_5Za9U zsq$U=NiX2~x2!<+AlU|a2$FM3qq;jKNnryWPEyS7bL{>F*#ry?lPhFi_Ha~AL^E1b zmtaa?V0lbFa&L|7N7k{^kxmk1Bx>9*Xx{o6&GBEOIj7KcDKs)$8WY1}qvDxA+Vu;% zO!3yLeiPj>QV^_-Z6(-gXWVJTL-8D6NH|TVuqBBJWEOiqF^>4zn}|!Igg$v^ks4_&9fxpyq)62HL^pN?6R8bwKiVhVdA$>-3asFXsRQ;@D% z&pCBWO71J>grY_#zf8t4;;L|_{95cyW4dn@M!7KCQ?6dA{QQIuw&>&gA5t1bAK%50 zGEMYlvh%K`#mZ7!ZOv8@CTKZ+Cz`Eh5NzyXYPNs8RS&C-HIg1qYicAB9@7XW5$ZJkb$WPF zu8~aey`|PH!YT=jA`CWy(FRSjgE(N1jmLk4WHIoDIK~nKbM#=0fhWZRLkyTS1%?Ee zYdk0Dq0?~LmH=Djb3zjAR(IM(*edcul8oRtCc$6OWP>WbgXm$6`Laz9Z_6C_Ac}yS zZq&o$P$Tt%%@BbxPujS*m;Nw_aMs4XPhf&{m}lwKijb$~MJ%->V@s{}0cO81j>d{c&4c%cK82~AKY^qJCe z3v$N54`$wRvZX>!hs9E-HXYtK^Eq9@trUSpWf%q|J8GmX(1^UkjoR~S8>ADy85v3m z4JKYr9ukOf6o)Iq1r^87*tm>X@&J1DbuN~&MC3vB>{9PO(O0B6L4bZXCt_O!$3jJpWqFxtQla@HS~Yi4ZxOSr`c| zC_ax0SfOZ4yO-V8H*NF}(n_HcPAE2<5k^$P-xaMr>Z)Ze`uKa*X^G>X%m5VL!&{KR zczoGHS+OrLa?3Qfqwh5TKkQt72d~Flh7lhz~0t&Xn z0ep&HL0N>oh^g>CVipj>Egev5&V^RR+X4Oj#(XrrWE_GxP%43=q{28Fzd#mh%g|C} zt3*t)R-)x$Z3)VwqZ--t9=#GOZLGRN?lgE#QY{i(0MbfU481Sr350`!_(#tYR~k#;)5IG(JbHfbW_yIL>t7txhM z6)IGoNz%xp@?26K+9$da&%tIoRL>J=?Zt@g+BT#7ZuyT=EL0T!DR; z3ahci6Lc+>l`5ub{8*LhRCJ9p(hkV7mcS0$DCuYij2r;Vd&!UwXG>IBZVgVsqd+CYY4xoecUqD7ZZ zn@GN?5ArySWjxDRsSr(kK`Zc4cYxKA4>`gvxtty)uL~0?m#5H?N;d)8YMMpY;4z#> z*CZo@z8O7TmE{~3HJC=V((#ZU1xPAHx3p5z%?-`H3`17>yC znP=4X;KQR&h}7GMt!vL<%PJkg)pw^5N90VH4sMtP9+(LA(1^eFFe7-lJX2!>I5i;n z&WWj$hHM{GRB*Pc;m<+CxbbQ-I_SN>kZ4@^jo_4Z?5)OL!6WXkv{bDRzSTI41hvys z1-;?G4N)njE;yimxtg2{zS;OYyVODk2Ib!AwI1J^uEdB)9;7ODH%@h-tWHuW?AKLVmGD{@WFjjhMnu7DU4kk^5ycMr zokh{0y$+f&-WlGy*>x^Wv{H1UDJEog&sEI27~nmWVSTaO5vtFniv=NvWzC-&9f$8J zU@fkn=-C*z{xdO2t1b7zx28 zMX{tnvOOAv?5rFdrZxs>K`s|!S#=tm3JjNz**FE`2=P6KE?; zz)}9#Yyw2wIlFGGx6U)nJ9+Y&E?0yE>dd~m*}N%JA|JYDOt@QpB5P=g(#fIy)7aVa zmKu`4uC&CHo1Q$ZL1PbQFUS@16Try1>+9T&^;Px0X~@nupNHs>IX9mlgYf3Nv@+1# z&}#NnYxFIP@Ak}U{Ev%s!iz7pI /// 放置距离设置 /// - public double PlaceBotton + public double PlaceTop { - get => GetDouble("placebotton", 100); - set => SetDouble("placebotton", value); + get => GetDouble("placetop", 400); + set => SetDouble("placetop", value); } /// /// 默认倒计时 diff --git a/VPet.Plugin.DemoClock/TimeClock.xaml b/VPet.Plugin.DemoClock/TimeClock.xaml index 4064ba7..46e5f0e 100644 --- a/VPet.Plugin.DemoClock/TimeClock.xaml +++ b/VPet.Plugin.DemoClock/TimeClock.xaml @@ -3,7 +3,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:VPet.Plugin.DemoClock" mc:Ignorable="d" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" MinHeight="100" Height="Auto" - Width="450" VerticalAlignment="Bottom" HorizontalAlignment="Center"> + Width="450" VerticalAlignment="Top" HorizontalAlignment="Center"> diff --git a/VPet.Plugin.DemoClock/TimeClock.xaml.cs b/VPet.Plugin.DemoClock/TimeClock.xaml.cs index b5bf2a4..1914808 100644 --- a/VPet.Plugin.DemoClock/TimeClock.xaml.cs +++ b/VPet.Plugin.DemoClock/TimeClock.xaml.cs @@ -56,7 +56,7 @@ namespace VPet.Plugin.DemoClock CloseTimer.Elapsed += CloseTimer_Elapsed; Opacity = master.Set.Opacity; - Margin = new Thickness(0, 0, 0, master.Set.PlaceBotton); + Margin = new Thickness(0, master.Set.PlaceTop, 0, 0); Master.MW.Main.MouseEnter += UserControl_MouseEnter; Master.MW.Main.MouseLeave += UserControl_MouseLeave; TimeTimer_Tick(); diff --git a/VPet.Plugin.DemoClock/winSetting.xaml b/VPet.Plugin.DemoClock/winSetting.xaml index afa7837..669a1c7 100644 --- a/VPet.Plugin.DemoClock/winSetting.xaml +++ b/VPet.Plugin.DemoClock/winSetting.xaml @@ -44,9 +44,9 @@ ToggleBrush="{DynamicResource DARKPrimaryDark}" Content="显示时间时启用24小时制" CheckedToggleBrush="{DynamicResource DARKPrimaryText}" Grid.Column="2" Checked="Switch24h_Checked" Unchecked="Switch24h_Checked" /> - - diff --git a/VPet.Plugin.DemoClock/winSetting.xaml.cs b/VPet.Plugin.DemoClock/winSetting.xaml.cs index 7f26d46..1822634 100644 --- a/VPet.Plugin.DemoClock/winSetting.xaml.cs +++ b/VPet.Plugin.DemoClock/winSetting.xaml.cs @@ -29,7 +29,7 @@ namespace VPet.Plugin.DemoClock Master = master; Set = Master.Set; Switch24h.IsChecked = Set.Hour24; - PlaceSilder.Value = Set.PlaceBotton; + PlaceSilder.Value = Set.PlaceTop; OpacitySilder.Value = Set.Opacity * 100; SwitchAutoLayer.IsChecked = Set.PlaceAutoBack; NumTimeDiff.Value = Set.TimeShifting; @@ -56,8 +56,8 @@ namespace VPet.Plugin.DemoClock { if (!AllowChange) return; - Set.PlaceBotton = PlaceSilder.Value; - Master.WPFTimeClock.Margin = new Thickness(0, 0, 0, Set.PlaceBotton); + Set.PlaceTop = PlaceSilder.Value; + Master.WPFTimeClock.Margin = new Thickness(0, Set.PlaceTop, 0, 0); } private void OpacitySilder_ValueChanged(object sender, RoutedPropertyChangedEventArgs e)