Fix DIconLayout (#1873) x starts at m_iBorder, not zero, so it should be compared to max width including the left side border