diff options
| author | Daniel Wilhelm <shieldwed@outlook.com> | 2019-05-12 22:44:22 +0000 |
|---|---|---|
| committer | Daniel Wilhelm <shieldwed@outlook.com> | 2019-05-12 22:44:22 +0000 |
| commit | 2cb4599782d970f386a67dfd4f4dab0d531d4348 (patch) | |
| tree | b873b15f50a981aacf8bb49fd646bfded2e7a73b /wx+/grid.cpp | |
| parent | Merge branch '10.11' into 'master' (diff) | |
| parent | 10.12 (diff) | |
| download | FreeFileSync-10.12.tar.gz FreeFileSync-10.12.tar.bz2 FreeFileSync-10.12.zip | |
Merge branch '10.12' into 'master'10.12
10.12
See merge request opensource-tracking/FreeFileSync!9
Diffstat (limited to 'wx+/grid.cpp')
| -rw-r--r-- | wx+/grid.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/wx+/grid.cpp b/wx+/grid.cpp index 114bb82d..2838f575 100644 --- a/wx+/grid.cpp +++ b/wx+/grid.cpp @@ -1177,9 +1177,10 @@ private: int pixelsPerUnitY = 0; wnd_.refParent().GetScrollPixelsPerUnit(nullptr, &pixelsPerUnitY); - if (pixelsPerUnitY <= 0) return; + if (pixelsPerUnitY <= 0) + return; - const double mouseDragSpeedIncScrollU = pixelsPerUnitY > 0 ? MOUSE_DRAG_ACCELERATION_DIP * wnd_.rowLabelWin_.getRowHeight() / pixelsPerUnitY : 0; //unit: [scroll units / (DIP * sec)] + const double mouseDragSpeedIncScrollU = MOUSE_DRAG_ACCELERATION_DIP * wnd_.rowLabelWin_.getRowHeight() / pixelsPerUnitY; //unit: [scroll units / (DIP * sec)] auto autoScroll = [&](int overlapPix, double& toScroll) { @@ -1797,7 +1798,7 @@ void Grid::setColumnConfig(const std::vector<Grid::ColAttributes>& attr) } //"ownership" of visible columns is now within Grid - visibleCols_ = visCols; + visibleCols_ = std::move(visCols); updateWindowSizes(); Refresh(); |