Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-30 aa8a3dcb1cb921c9f721aac4c9c87c696ce8a354

 HDL_ON/UI/UI0-Stan/Controls/FrameLayoutControls/FrameRowControl.cs

@@ -126,7 +126,8 @@
            }

            var btnCaption = new NormalViewControl(i_width, i_height, real);

            btnCaption.X = XX;



            //2021.03.18 整英文版,加上自动换行

            btnCaption.IsMoreLines = true;

            btnCaption.Text = i_caption;



            return btnCaption;

@@ -329,6 +330,8 @@
            btnContr.TextColor = CSS_Color.PromptingColor1;

            btnContr.Text = i_text;

            btnContr.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;

            //2021.03.18 整英文版,加上自动换行

            btnContr.IsMoreLines = true;



            return btnContr;

        }