Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add setting to configure user dragging #2709

Merged
merged 3 commits into from Dec 23, 2016

Conversation

@Lartza
Copy link
Contributor

commented Dec 14, 2016

Adds a setting to configure user dragging behavior the same way channel dragging is currently configured, UI and all. Currently users can for example be dragged accidentally with extra mouse buttons that have been set as PTT and you can't disable this behaviour like you can for channels.

Not sure if something else would be preferable to sharing enums with ChannelDrag?
Also I am unsure if I need to add or modify any translation files for this.

@mkrautz mkrautz self-assigned this Dec 20, 2016

@mkrautz

This comment has been minimized.

Copy link
Member

commented Dec 20, 2016

Sorry for letting this sit for a while, I haven't been able to work on Mumble the last week or so.

Code looks good to me, but I'd like to play with it a bit, so I'll try to patch it in and get back to you.

Thanks!

@Lartza

This comment has been minimized.

Copy link
Contributor Author

commented Dec 20, 2016

No worries, I don't honestly care if you scrap and rewrite this, this seemed to work and was an easy way to implement :P

Me and my admin friend just really wish this feature or for extra mouse buttons to not drag users and fixing the mouse probably breaks someone elses workflow ;)

@@ -461,6 +462,7 @@ BOOST_TYPEOF_REGISTER_TYPE(Settings::OverlayShow)
BOOST_TYPEOF_REGISTER_TYPE(Settings::ProxyType)
BOOST_TYPEOF_REGISTER_TYPE(Settings::ChannelExpand)
BOOST_TYPEOF_REGISTER_TYPE(Settings::ChannelDrag)
BOOST_TYPEOF_REGISTER_TYPE(Settings::UserDrag)

This comment has been minimized.

Copy link
@mkrautz

mkrautz Dec 22, 2016

Member

No new UserDrag type was introduced, so this seems like a superfluous addition?

This comment has been minimized.

Copy link
@Lartza

Lartza Dec 23, 2016

Author Contributor

Forgot to remove this line when I removed the introduction of UserDrag, removed and squashed to the second commit.

@@ -259,7 +259,7 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="1" column="0">

This comment has been minimized.

Copy link
@mkrautz

mkrautz Dec 22, 2016

Member

Maybe squash this into the first commit?

break;
case Settings::Move:
break;
default:

This comment has been minimized.

Copy link
@mkrautz

mkrautz Dec 22, 2016

Member

Please leave out the default case.

The compiler should be smart enough to warn if we don't handle all cases, if we add new ones.

(I know the default case is there for channel drags, but there is no need to add the extra translation string here...)

Lari Tikkanen added 2 commits Dec 14, 2016
Lari Tikkanen
Implement configuring user dragging
This allows the user dragging mechanic to be configured the same way
channel dragging is configured.

@Lartza Lartza force-pushed the Lartza:cfg-user-dragging branch from 831ee20 to 7586175 Dec 23, 2016

@Lartza

This comment has been minimized.

Copy link
Contributor Author

commented Dec 23, 2016

Everything mentioned fixed. Had some troubles with squashing at first but I know what to do now :P
Can squash the commits more if you wish, all the review changes seemed to compile and work

@mkrautz

This comment has been minimized.

Copy link
Member

commented Dec 23, 2016

Hm, apparently I missed the fact that the original PR used its own UserDrag enum... But this is fine, too.

@mkrautz mkrautz merged commit ddd4764 into mumble-voip:master Dec 23, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.