From 60e0e9a8fcb94ee81efd069c727ee2e49b79b190 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 May 2020 20:57:51 +0200 Subject: [PATCH] Make RefreshDropHint() code slightly shorter and simpler Use an alias instead of typing the same long m_dropItemInfo.m_row multiple times. Remove unnecessary use of std::max(). --- src/generic/datavgen.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 1518e6e4b4..0bf03c6c78 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -2107,21 +2107,25 @@ bool wxDataViewMainWindow::EnableDropTarget( const wxDataFormat &format ) void wxDataViewMainWindow::RefreshDropHint() { + const unsigned row = m_dropItemInfo.m_row; + switch (m_dropItemInfo.m_hint) { case DropHint_None: break; case DropHint_Inside: - RefreshRow(m_dropItemInfo.m_row); + RefreshRow(row); break; case DropHint_Above: - RefreshRows(m_dropItemInfo.m_row == 0 ? 0 : m_dropItemInfo.m_row - 1, m_dropItemInfo.m_row); + RefreshRows(row == 0 ? 0 : row - 1, row); break; case DropHint_Below: - RefreshRows(m_dropItemInfo.m_row, std::max(m_dropItemInfo.m_row + 1, GetRowCount() - 1)); + // It's not a problem here if row+1 is out of range, RefreshRows() + // allows this. + RefreshRows(row, row + 1); break; } }