合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs

@@ -10,9 +10,9 @@
    public class MostRightIconControl : FrameLayoutControl
    {
        /// <summary>

        /// 图标控件

        /// 图标控件(迫不得己，这个东西开放出去)

        /// </summary>
        private IconControlCommon btnIcon = null;
        public IconControlCommon btnIcon = null;
        /// <summary>

        /// UnSelectedImagePath

        /// </summary>
@@ -46,7 +46,7 @@
        public MostRightIconControl(int i_width, int i_height)
        {
            this.Width = Application.GetMinRealAverage(110);
            this.Height = Application.GetMinRealAverage(110);
            this.Height = this.Parent != null ? this.Parent.Height : ControlCommonResourse.ListViewRowHeight;
            this.Gravity = Gravity.CenterVertical;

            var XX = Application.CurrentWidth - Application.GetMinRealAverage(i_width) - ControlCommonResourse.XXLeft;