From 35356066eb0c0377e59b86ac5f2ed541ec94aa35 Mon Sep 17 00:00:00 2001 From: Sunny Date: Sat, 13 Mar 2021 10:02:10 +0800 Subject: [PATCH] =?UTF-8?q?*=20UINavMenu=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E5=8F=AF=E8=83=BD=E5=BC=95=E8=B5=B7=E7=9A=84?= =?UTF-8?q?Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bin/net40/SunnyUI.Demo.exe | Bin 578048 -> 578048 bytes Bin/net40/SunnyUI.dll | Bin 1667584 -> 1667584 bytes Bin/net5.0-windows/SunnyUI.dll | Bin 1636864 -> 1636864 bytes Bin/net5.0-windows/ref/SunnyUI.dll | Bin 638464 -> 638464 bytes Bin/netcoreapp3.1/SunnyUI.dll | Bin 1636352 -> 1636352 bytes SunnyUI.Demo/FMain.Designer.cs | 36 +++++++-------- SunnyUI.Net5.Demo/FMain.Designer.cs | 39 ++++++++-------- SunnyUI.Net5.Demo/FMain.resx | 69 ++-------------------------- SunnyUI/Controls/UINavMenu.cs | 2 +- 9 files changed, 40 insertions(+), 106 deletions(-) diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index e20e220c191b027fc08161b21067c80dfc82aba6..ee06ac975d40d14f555126d6488108a9b56c42f2 100644 GIT binary patch delta 15393 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 DZEKbS delta 15452 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 diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 3ba7824ea1d33d56f30d39387751d0592c1edad6..57875d4eb3c6d154bcc513b4addbd64a69759049 100644 GIT binary patch delta 995 zcmXxiTTGH+9LMqJB@jw6N=@HYTMpf?5uc&Zh~i$WAX(~9hyS;A;P+1Yli^~Cg#YEQnky?? zNKy+@bUg-WH3sPh40g+6BZlZEr0Hf1(=8aGR*cfEn4sH`q1%zAHOSFgh#pzgK}UDM zKy4_a^)LlEcEU{Uu+UwwQU`2wH=J}2T+|6KZGeyNg`YMeNShF$`w*r3k)+K?Q5OcN z8-vt?A$kC5dJx031tatjMtgWst(f4#iwtc;mbN2D4?~1xaRfSg6b5<>W%M|fP#>1k z4wz^s%=82-^dzkG6l}B$PI?+H>W7z}fsdYrpPoZ7BnQNKM7X$sD7}az4Io8>7@(Ih zNH1fEUO}36W0>|}goZFm!fHa6$n`w6xjdSAJfvDf2OO{G;^7z&Hh@`nw#Y+ z*H)`sZz`0d2U*>R6heITCDNw^eb_^VP>@8W{rQdT!1r_RJ#f#rqz) z=lZ>#bjjs?RxWM!NfI;_4q2E3t>03zd=?2((AOn7qz0d)O43IHIw6UFWA0{#%AKK- zSagnIY9&LZ`SX2S__)ladok*ig$WZh50i8srs#gm&;y9jgP5oJSfGcnL<^wqmPH|S z^e~d?5v0>1WYS{fIyfDLiI$*%nqj7;u+lQr(Q-7=3fQRy9kdcoS_Kca!cUJONRMNH zoBN^3DePhyhRVT#schMq#Co2S))dA^*+0&T<+wL$HY#Tn>m6O!p!q|;_( z(iUXVbI75s$fa#C(eo&vc9>~9tn>ov=tVTqOR&?+=%82Nq*vi_$qvy0KVPmPNUvjn zIuN3r2-7Z%(i@ndH!(?_n4;a7p)N$I8}qaW3-lJ2=xwOovgn15dXP--Af4VtCcTF& z+J_vP=S423`!G=-3aB4u`T$n?5Op+wCi)0=`WPMb37oVa9vXySdHGatjddps=~+BW zP!fg=KV}V|u6(t8$nVK_tttMUJv}z*PID!))hvl6vlN!f)+lMNw5{(qPU~L`3#qV3 z#VcLSLOh~Sjm)QiBl-s=F)$r3rY_J`BO48OuBJ{^ZD`56@p)T*dznrX2-nCZo0eC% z>{(uoZeID;`Y~QL>;EMTZ>qS#|Ir?OUhB409l|r!;M^K#cl0drnYNDnlVsN32@4m*xadwuSg;(8MldWIFwu{ICwZTL=1k_SW`a}I!Kvy6%!j1WAsyN&#ssCK<9Vkrx?45_4;1Tb?15 zXOP(JT)P1Ed)?lWd#S}laNqFi{o%tGd# zwWy+a2d6LoZQ58W)rInBj4YLO6*jsJcDfyQvnqC=fbN8Y?t+sR!9|^L(_(mN32JF6d~`SbbPs}bFT!*mBGiRm zT84oD$9@dbatzS}7^W3S(1RGEhcHgv&}k(m=wT%35r_;`9EFKiL8ix`(BsIZ9@yv! z*y%|W&}um7DLCnAxab+UGXkopfrmG>sHJuA(X;SVFM{+O!t^{Mv>v^*0WYZ!ee?nb zXd?z`6NczT4AV20{^9k^)-9vVh1y$c_0ho5#JNIMax_Yk4?(M!AVl19)+cSbS5@c@G~ zh9TOGVcLTPeTWen$2jeUP9I@{K1Py0fyh+FQzI4Fn_!+7YcHN`qfcr)C8zB}j7MoaBk|@k)g@|%G)Hq=-IeMg_wZ47kLtC9*=rV;cmz4;6mtGio zXU;Dx+{Eb&ew)%3NsS)Mw3a2XM5beN*j&{zt$%ko{-^lx!jsUHq$V^Oo@TpriHcYQ zBV7xbu7io@A%m_*Hr;?6x)C{gMQlPI-HZad1y-7m3R(agErgwJg@YEsNsHm8+u)_! z;io$gqE__Mofvd+?7|Q&!7wewC@sSnEk~H{Mub)%N-Ghgdmxe&u@^d81tYD7Olx4G z`;b9x$fo;|Lk}R2)}nwOgq0pb1+9ZE$)$*T*mEb^c-^NdF0UxD4-W%rI%1aFT+MXuv0G_)CVWM0yn)1FYSb%UPFjpM=$L{AN6B^ zZtlh)#|;e80EX#JjM7^eqqh;JK}2W>QF;e4dKV&D5%-{@Jus@%_YF?Hr=#D%lG!}9 zqu+QuY|Q;>c=@|rTl~nf_>wa8{*333FNMu#3)n)I%F@^(^^Z>;sZL$8{PQOvZL@0l zOE)l6f+9@8j}!7Dt&dw@@b`plHg;rgky{Mw)<1jLV{yO3KrkyJSFN1AZ96%8%eQLI x_rGfHkG*dD{`KvOF+T8r{g~OCy3^C7arI3^w#-qJf5=l>P5f##B`W`t{sOFT1^oa3 diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll index a9503ecea37ef822263cd978c05f13fe956bcc61..e006f0535772d96eef371a28432a2789d4b2d473 100644 GIT binary patch delta 841 zcmZY7Pe{{Y7zgn8oxlCu4sNa*6B!*1;;bg___dhwFX=xfla7rvk8c@8f;hi4#f8_3&Uzfwl$ zBBRlWMGi;DI;2~dvdUsZW3t0goT}+5SX?$Vj(_U<>hZKRPOeoJ zr9t%RQY|rN-)chgN3Gtf+O?5!qo{Z$grYxJOUmruOhOStRJ6AV2m9jH-qYUXW_9WB z)n+;VVnrQVQ6*zw3eqd8^6O*z_h;qD&v2Z}lp;abBS|+PMK@xKZo)L(j109PlhZ^Q zvUCe(=vK_qZOGAbEKwj&E1=A4!ipkV2{X09LaShcR{?f?0YLIeH9B z^I=WYBhTSDlm$(kKoLC&Gj+p48(^iU;GiBjX(L>;32u5CUfK*F^}~xcFi6iMLfa6dKExNauxLku!v!R12U7GRrf4Uo=_O?7Wn`%zGxQ2(=~d+DH7wCC zyfQ<$!tFm>1cchBjO@21q3bwQrezxQ&ruaB0O%D!~( ZJMB$jwAz$j^FdoS8b<2=-hZ^Z@DGmW49Nfh delta 840 zcmZY7T}YEr90u@n*1OleutHJ#a;tn?YPD+COsn-hGjpZp%&hh4Dy!M&q8n+81S3W` z-hl)XUJOE;LO5C%f;R?T>~fcbZWe@0h47}D&{NP=2cF;me=ZK3izi&D3Kyz|UMLH- zFEi1IMZSrSbxDsdWwp`qO%oQq!eH0CWvfh1jma)UanpFor@8iC_e{Z<9*ecsO_eB% z(jdaRR7;K7x0;ZAQLneDHQMO7QB*z^!mK}2ORbJCCZPx+Dmy!blY8->y{WU=&FR+P zt1a@~^JR5#S(S`|S&>>+l^-9KU!v_v>idi`Hy4WYN2`&bYmlUCF-_NDmaa#dmLo$g z$mBI)MV4+rj&4MrZo(3+K!F0vye2APrZ$w(&9Kla*l0EEv<6PP1unW3-Vnz&_^2Iz zx*Y+!13|hI{nUX0T8jwXg&5t95$Z&o)*(UnAW7>nO&c&v_aaUAAw%~gOI^s(1IW{Z zSfYnem=9^NVhL__Gd^7+*?L&axMUdV@ zKfR9u`T!C75Hb1)BQ%IOeT>AQb;8J~Oi{`@Vd`o4uhglbucqYZl|feN-+49MKB<+< ZaH?-odtH=T^+Ee-G>kU$XdfG#XLBU`}LOw`T8uXLw!1r_RJ=}Yq&S{>gY@Vp>ysC_Q z8F}M&B}@0*{d=T*k0e1=qcRAy&uv?n=GiMj3V2#1yJYuBibP$;eXWqhzY%IpQ8-f+ z5}TRlFr}QLP<8xV?HyDL<0XFfOf8k*{c7^XQGp}7dt4G6~?L>|WIMnvc)jML4Sq+2jew?e5gh;7i)d?e8VB-8CM(H%&m zJCQ*PkwuGOwsYErGFpr(YDOKkz)E++M)$x$OW>k=;idcFr={qlWf-942+;iq(gPT# z6&Rrh5vGSQMk^7aRT!s-F-ebLT4OheYACe^Q3EYKiX>W#WO@uHT8A`x92xWkvgk?V z(Nid(r(ve`D5DLiqE^(=GqBRLu+c_1=sCFPd3b3P{PY6)v4$*6Llet-arPui7eWIJlcr@ zy3q|Yr!JIH52~mab@Udj^fqkN2M4_a7rhHF?S`NBppW`7AiwR^jcA;nejS_7;$%;M z{LrWPZ&$J(I*qxxz1lVJTT(ARahlr`*aDWwlGsAFh%J`Q?fRwVD_4~NxhACTg$kbL z8W!YT3P$yO`Zs1SPa*>|@nD*KkE42HeB-N*RJoKawHLZKy?fVebmoA@OE&4pW zI*f3MreoI+h zV;b~&jM7tYUyhXNlO(9ls|+G5;C04Ze7O>&Az!29lH5K?u}YWvNGl}qZw)t@6mFA3 zVv93^DP@yF)%I&s@R?ee>xGCMP>WtULYOlh7t1P3suw?eUaS$3YlJXoXNp&C8WF=i z^RDa+8|QG~+i%rgsnorGUd5I%HH&1+S(LnfUei^joDj+H+#}^$d8AwyN^$isGl%m=%+!1;Nz4&Z{5oc_DyO;P^^ Dqa6yK diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index f18710e5..2b8279fa 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("控件"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("窗体"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("图表"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("主题"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("控件"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("窗体"); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("图表"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("主题"); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FMain)); this.uiLogo1 = new Sunny.UI.UILogo(); this.uiAvatar = new Sunny.UI.UIAvatar(); @@ -46,13 +46,11 @@ // // Aside // - this.Aside.ExpandSelectFirst = false; this.Aside.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); this.Aside.ItemHeight = 36; this.Aside.LineColor = System.Drawing.Color.Black; this.Aside.Location = new System.Drawing.Point(2, 145); this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; - this.Aside.SecondBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(66)))), ((int)(((byte)(66))))); this.Aside.ShowOneNode = true; this.Aside.ShowSecondBackColor = true; this.Aside.ShowTips = true; @@ -65,20 +63,20 @@ this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiLogo1); this.Header.Location = new System.Drawing.Point(2, 35); - treeNode5.ImageIndex = 1; - treeNode5.Name = "节点0"; - treeNode5.Text = "控件"; - treeNode6.Name = "节点1"; - treeNode6.Text = "窗体"; - treeNode7.Name = "节点2"; - treeNode7.Text = "图表"; - treeNode8.Name = "节点2"; - treeNode8.Text = "主题"; + treeNode9.ImageIndex = 1; + treeNode9.Name = "节点0"; + treeNode9.Text = "控件"; + treeNode10.Name = "节点1"; + treeNode10.Text = "窗体"; + treeNode11.Name = "节点2"; + treeNode11.Text = "图表"; + treeNode12.Name = "节点2"; + treeNode12.Text = "主题"; this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode5, - treeNode6, - treeNode7, - treeNode8}); + treeNode9, + treeNode10, + treeNode11, + treeNode12}); this.Header.SelectedIndex = 0; this.Header.Size = new System.Drawing.Size(1020, 110); this.Header.Style = Sunny.UI.UIStyle.Custom; diff --git a/SunnyUI.Net5.Demo/FMain.Designer.cs b/SunnyUI.Net5.Demo/FMain.Designer.cs index a7e412b4..4ea74a63 100644 --- a/SunnyUI.Net5.Demo/FMain.Designer.cs +++ b/SunnyUI.Net5.Demo/FMain.Designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("控件"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("窗体"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("图表"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("主题"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("控件"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("窗体"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("图表"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("主题"); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FMain)); this.uiLogo1 = new Sunny.UI.UILogo(); this.uiAvatar = new Sunny.UI.UIAvatar(); @@ -47,7 +47,6 @@ this.Aside.LineColor = System.Drawing.Color.Black; this.Aside.Location = new System.Drawing.Point(2, 145); this.Aside.MenuStyle = Sunny.UI.UIMenuStyle.Black; - this.Aside.ShowOneNode = true; this.Aside.ShowTips = true; this.Aside.Size = new System.Drawing.Size(250, 573); this.Aside.Style = Sunny.UI.UIStyle.Custom; @@ -57,20 +56,20 @@ this.Header.Controls.Add(this.uiAvatar); this.Header.Controls.Add(this.uiLogo1); this.Header.Location = new System.Drawing.Point(2, 35); - treeNode1.ImageIndex = 1; - treeNode1.Name = "节点0"; - treeNode1.Text = "控件"; - treeNode2.Name = "节点1"; - treeNode2.Text = "窗体"; - treeNode3.Name = "节点2"; - treeNode3.Text = "图表"; - treeNode4.Name = "节点2"; - treeNode4.Text = "主题"; + treeNode5.ImageIndex = 1; + treeNode5.Name = "节点0"; + treeNode5.Text = "控件"; + treeNode6.Name = "节点1"; + treeNode6.Text = "窗体"; + treeNode7.Name = "节点2"; + treeNode7.Text = "图表"; + treeNode8.Name = "节点2"; + treeNode8.Text = "主题"; this.Header.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3, - treeNode4}); + treeNode5, + treeNode6, + treeNode7, + treeNode8}); this.Header.SelectedIndex = 0; this.Header.Size = new System.Drawing.Size(1020, 110); this.Header.Style = Sunny.UI.UIStyle.Custom; @@ -78,7 +77,7 @@ // // uiLogo1 // - this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiLogo1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiLogo1.Location = new System.Drawing.Point(20, 15); this.uiLogo1.MaximumSize = new System.Drawing.Size(300, 80); this.uiLogo1.MinimumSize = new System.Drawing.Size(300, 80); @@ -91,7 +90,7 @@ // uiAvatar // this.uiAvatar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.uiAvatar.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiAvatar.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.uiAvatar.Location = new System.Drawing.Point(939, 25); this.uiAvatar.MinimumSize = new System.Drawing.Size(1, 1); this.uiAvatar.Name = "uiAvatar"; diff --git a/SunnyUI.Net5.Demo/FMain.resx b/SunnyUI.Net5.Demo/FMain.resx index 8afef9d3..24c27de7 100644 --- a/SunnyUI.Net5.Demo/FMain.resx +++ b/SunnyUI.Net5.Demo/FMain.resx @@ -1,64 +1,4 @@ - - - + @@ -117,11 +57,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - + + AAABAAcAMDAAAAEACACoDgAAdgAAACAgAAABAAgAqAgAAB4PAAAQEAAAAQAIAGgFAADGFwAASEgAAAEA IACIVAAALh0AADAwAAABACAAqCUAALZxAAAgIAAAAQAgAKgQAABelwAAEBAAAAEAIABoBAAABqgAACgA diff --git a/SunnyUI/Controls/UINavMenu.cs b/SunnyUI/Controls/UINavMenu.cs index fa5dfc63..df68b57b 100644 --- a/SunnyUI/Controls/UINavMenu.cs +++ b/SunnyUI/Controls/UINavMenu.cs @@ -586,7 +586,7 @@ namespace Sunny.UI } } - [Description("展开节点后选中第一个子节点"), DefaultValue(true), Category("SunnyUI")] + [Description("展开节点后选中第一个子节点"), Category("SunnyUI")] public bool ExpandSelectFirst { get; set; } = true; public string Version { get; }