@nicolasfella Will these work for you? Let me know if you need thumb buttons as well.

I think the Mouse itself needs a bit more curve with less box.

In D16951#360965, @rizzitello wrote:

I think the Mouse itself needs a bit more curve with less box.

I kind of agree. I was just copying the existing dialog-input-devices icon, but I suppose I could change that as well.

+1 for more curves. That rectangle doesn't particular scream "I'm a mouse!" to me.

dialog-input-devices itself is pretty lousy, honestly. It would also use a bit of sprucing up rather than copying its style.

Looks good to me +1

Much better shape!

What do you think about making the mouse wheel detached from the top of the mouse so it looks more like a wheel and less like a notch? Then also you might not need to omit it from input-mouse-click-middle'

In D16951#361294, @ngraham wrote:

Much better shape!

What do you think about making the mouse wheel detached from the top of the mouse so it looks more like a wheel and less like a notch? Then also you might not need to omit it from input-mouse-click-middle'

It does look better on the other mouse icons, but the middle mouse button still needs to be covered by the blue highlight because otherwise the highlight is too difficult to see.

detached MMB

highlight under detached MMB

slightly longer highlight under detached MMB

What about making the MMB turn white when it has the blue highlight?

In D16951#361317, @ngraham wrote:

What about making the MMB turn white when it has the blue highlight?

white MMB

white MMB with slightly longer highlight next to right click icon with original highlight length

I would suggest making the mouse wheel itself turn blue as highlighting

Is this too small or not legible enough?

I think it's not quite clear enough on it's own, however together with the other icons it will be clear

Looks good! +1

It's been 3 days and no response. It has already been approved by another reviewer, so I'm going to land this now.

In D16951#363861, @nicolasfella wrote:

Looks great!

Ah thanks!

I thought I did this already. I rebased onto master, then added the version of the file I wanted, then continued the rebase, then updated the diff. Is there something I missed?

In D16951#363875, @ndavis wrote:

I thought I did this already. I rebased onto master, then added the version of the file I wanted, then continued the rebase, then updated the diff. Is there something I missed?

Sounds reasonable. Maybe you forgot to save, or forgot to add a file or added the wrong file.

In any case, try again and check the files for merge conflict markers

In D16951#363876, @nicolasfella wrote:

In D16951#363875, @ndavis wrote:

I thought I did this already. I rebased onto master, then added the version of the file I wanted, then continued the rebase, then updated the diff. Is there something I missed?

Sounds reasonable. Maybe you forgot to save, or forgot to add a file or added the wrong file.

Save what or how? Doesn't arc diff --update D16951 save things? I know I added the right files and there were only 2 conflicts (icons/actions/16/dialog-input-devices.svg and icons-dark/actions/16/dialog-input-devices.svg).

I just pulled the patch with arc patch D16951
If I do git status, it says

On branch arcpatch-D16951
nothing to commit, working tree clean

This is what Git looks like in git-dag:

In D16951#363878, @ndavis wrote:

Save what or how? Doesn't arc diff --update D16951 save things? I know I added the right files and there were only 2 conflicts (icons/actions/16/dialog-input-devices.svg and icons-dark/actions/16/dialog-input-devices.svg).

Saved in the program you resolved the conflict with

I just pulled the patch with arc patch D16951
If I do git status, it says

On branch arcpatch-D16951
 nothing to commit, working tree clean

This is what Git looks like in git-dag:

git thinks everything is ok, but the merge conflict markers are still in the file.

I think you should restore the unmerged version, merge again, resolve the conflict and upload it again

In D16951#363879, @nicolasfella wrote:

In D16951#363878, @ndavis wrote:

Save what or how? Doesn't arc diff --update D16951 save things? I know I added the right files and there were only 2 conflicts (icons/actions/16/dialog-input-devices.svg and icons-dark/actions/16/dialog-input-devices.svg).

Saved in the program you resolved the conflict with

I just pulled the patch with arc patch D16951
If I do git status, it says

On branch arcpatch-D16951
 nothing to commit, working tree clean

This is what Git looks like in git-dag:

git thinks everything is ok, but the merge conflict markers are still in the file.

I think you should restore the unmerged version, merge again, resolve the conflict and upload it again

How do I do this?

This assumes the files that you uploaded before the merge are all correct.

• Save the correct icons somewhere.
• Checkout the old diff: arc patch --diff 45755 (while on master)
• Begin rebase: git rebase master
• Override the files with conflicts with the files you saved
• git add files
• git rebase --continue
• Upload it: arc diff

Ok, I see what the issue was. The conflicts are literally stored *in* the file that has the conflict as text, so dialog-input-devices.svg was turned into a diff of the old and new versions.

So now I have 2 commits and one of them is already on master, but they're both called "Add mouse button icons" and use the same description. Should I update this diff to describe only the latest commit or make it apply to both?

In D16951#363898, @ndavis wrote:

So now I have 2 commits and one of them is already on master, but they're both called "Add mouse button icons" and use the same description. Should I update this diff to describe only the latest commit or make it apply to both?

Just rename this one to something like "Resolve merge conflict"