blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 23:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix layer model sign comparisons

Browse source
This commit is contained in:
Dan Paulat 2023-10-28 07:08:59 -05:00
parent ba75326c0c
commit f7851488d6
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scwx-qt/source/scwx/qt/model/layer_model.cpp
View file

@ -839,7 +839,7 @@ bool LayerModel::dropMimeData(const QMimeData* data,
// Ensure rows are in numerical order // Ensure rows are in numerical order
std::sort(sourceRows.begin(), sourceRows.end()); std::sort(sourceRows.begin(), sourceRows.end());
if (sourceRows.back() >= p->layers_.size()) if (sourceRows.back() >= static_cast<int>(p->layers_.size()))
{ {
logger_->error("Cannot perform drop action, invalid source rows"); logger_->error("Cannot perform drop action, invalid source rows");
return false; return false;
@ -907,12 +907,13 @@ bool LayerModel::moveRows(const QModelIndex& sourceParent,
{ {
bool moved = false; bool moved = false;
if (sourceParent != destinationParent || // Only accept internal moves if (sourceParent != destinationParent || // Only accept internal moves
count < 1 || // Minimum selection size of 1 count < 1 || // Minimum selection size of 1
sourceRow < 0 || // Valid source row (start) sourceRow < 0 || // Valid source row (start)
sourceRow + count > p->layers_.size() || // Valid source row (end) sourceRow + count >
destinationChild < 0 || // Valid destination row static_cast<int>(p->layers_.size()) || // Valid source row (end)
destinationChild > p->layers_.size()) destinationChild < 0 || // Valid destination row
destinationChild > static_cast<int>(p->layers_.size()))
{ {
return false; return false;
} }