Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nheko
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
nheko
Commits
172d111d
Commit
172d111d
authored
6 years ago
by
Konstantinos Sideris
Browse files
Options
Downloads
Patches
Plain Diff
Add -Wshadow
parent
6d474b77
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-0
1 addition, 0 deletions
CMakeLists.txt
src/Splitter.cc
+7
-7
7 additions, 7 deletions
src/Splitter.cc
with
8 additions
and
7 deletions
CMakeLists.txt
+
1
−
0
View file @
172d111d
...
...
@@ -96,6 +96,7 @@ if(NOT MSVC)
-Wall \
-Wextra \
-Werror \
-Wshadow \
-pipe \
-pedantic \
-fsized-deallocation \
...
...
This diff is collapsed.
Click to expand it.
src/Splitter.cc
+
7
−
7
View file @
172d111d
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment