Mercurial > hg > orthanc-stone
diff Framework/Widgets/LayoutWidget.cpp @ 527:b1377625e4ba bgo-commands-codegen
Removed ICommand and friends + fixed warnings + added missing header files in
solution (in CMakeLists.txt file)
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Sun, 17 Mar 2019 20:14:20 +0100 |
parents | 3b4df9925db6 |
children | 4f2416d519b4 |
line wrap: on
line diff
--- a/Framework/Widgets/LayoutWidget.cpp Tue Mar 12 15:01:36 2019 +0100 +++ b/Framework/Widgets/LayoutWidget.cpp Sun Mar 17 20:14:20 2019 +0100 @@ -74,7 +74,7 @@ std::vector<Touch> relativeTouches; for (size_t t = 0; t < displayTouches.size(); t++) { - relativeTouches.push_back(Touch((int)displayTouches[t].x - left_, (int)displayTouches[t].y - top_)); + relativeTouches.push_back(Touch(displayTouches[t].x - left_, displayTouches[t].y - top_)); } tracker_->MouseMove(x - left_, y - top_, relativeTouches); @@ -226,7 +226,7 @@ } else if (isHorizontal_) { - unsigned int padding = paddingLeft_ + paddingRight_ + (children_.size() - 1) * paddingInternal_; + unsigned int padding = paddingLeft_ + paddingRight_ + (static_cast<unsigned int>(children_.size()) - 1) * paddingInternal_; float childWidth = ((static_cast<float>(width_) - static_cast<float>(padding)) / static_cast<float>(children_.size())); @@ -250,7 +250,7 @@ } else { - unsigned int padding = paddingTop_ + paddingBottom_ + (children_.size() - 1) * paddingInternal_; + unsigned int padding = paddingTop_ + paddingBottom_ + (static_cast<unsigned int>(children_.size()) - 1) * paddingInternal_; float childHeight = ((static_cast<float>(height_) - static_cast<float>(padding)) / static_cast<float>(children_.size()));