d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add -Wshadow

Browse source
This commit is contained in:
Konstantinos Sideris 2018-07-08 22:10:40 +03:00
parent 6d474b77f1
commit 172d111d1c
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -96,6 +96,7 @@ if(NOT MSVC)
-Wall \
-Wextra \
-Werror \
-Wshadow \
-pipe \
-pedantic \
-fsized-deallocation \

14
src/Splitter.cc
View file

@ -88,12 +88,12 @@ Splitter::onSplitterMoved(int pos, int index)
rightMoveCount_ += 1;
if (rightMoveCount_ > moveEventLimit_) {
auto left = widget(0);
auto pos = left->mapFromGlobal(QCursor::pos());
auto left = widget(0);
auto cursorPosition = left->mapFromGlobal(QCursor::pos());
// if we are coming from the right, the cursor should
// end up on the first widget.
if (left->rect().contains(pos)) {
if (left->rect().contains(cursorPosition)) {
left->setMinimumWidth(ui::sidebar::SmallSize);
left->setMaximumWidth(ui::sidebar::SmallSize);
@ -104,9 +104,9 @@ Splitter::onSplitterMoved(int pos, int index)
leftMoveCount_ += 1;
if (leftMoveCount_ > moveEventLimit_) {
auto left = widget(0);
auto right = widget(1);
auto pos = right->mapFromGlobal(QCursor::pos());
auto left = widget(0);
auto right = widget(1);
auto cursorPosition = right->mapFromGlobal(QCursor::pos());
// We move the start a little further so the transition isn't so abrupt.
auto extended = right->rect();
@ -114,7 +114,7 @@ Splitter::onSplitterMoved(int pos, int index)
// if we are coming from the left, the cursor should
// end up on the second widget.
if (extended.contains(pos) &&
if (extended.contains(cursorPosition) &&
right->size().width() >=
conf::sideBarCollapsePoint + ui::sidebar::NormalSize) {
left->setMinimumWidth(ui::sidebar::NormalSize);