Merge branch 'WJC' into wxr6

wxr

2021-11-05 f6c4e9886b924d8f5271e8b58378d7a07269dcb8

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunAllAreaView.cs

@@ -17,8 +17,8 @@
        /// </summary>
        public Button btnIcon1 = new Button
        {
            Width = Application.GetMinRealAverage(16),
            Height = Application.GetMinRealAverage(16),
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(19),
            X = Application.GetRealWidth(TextSize.left16),
            UnSelectedImagePath = "LogicIcon/down.png",
@@ -45,8 +45,8 @@
        /// </summary>
        public Button btnIcon2 = new Button
        {
            Width = Application.GetMinRealAverage(16),
            Height = Application.GetMinRealAverage(16),
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(19),
            X = Application.GetRealWidth(122),
            UnSelectedImagePath = "LogicIcon/down.png",