hrev54330 adds 1 changeset to branch 'master'
old head: 088f5faefed1004930b4408b86e94c5757b4b6b5
new head: 7522ed82b814f0f70b814332ad54cf5cba8910a5
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=7522ed82b814+%5E088f5faefed1
----------------------------------------------------------------------------
7522ed82b814: preferences/input Add default mappings to mouse buttons 4/5
* Adds default mappings to newly added buttons 4 and 5
* Include mappings of buttons 4 and 5 in settings dump
* Fixes Bug #16268
Signed-off-by: Rob Gill <rrobgill@xxxxxxxxxxxxxx>
Change-Id: If466088e622a9e818f9eb7bd67c3a65154b9ad37
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2924
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Rob Gill <rrobgill@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54330
Commit: 7522ed82b814f0f70b814332ad54cf5cba8910a5
URL: https://git.haiku-os.org/haiku/commit/?id=7522ed82b814
Author: Rob Gill <rrobgill@xxxxxxxxxxxxxx>
Date: Wed Jun 17 03:01:47 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Wed Jun 17 04:51:08 2020 UTC
Ticket: https://dev.haiku-os.org/ticket/16268
----------------------------------------------------------------------------
1 file changed, 10 insertions(+), 3 deletions(-)
src/preferences/input/MouseSettings.cpp | 13 ++++++++++---
----------------------------------------------------------------------------
diff --git a/src/preferences/input/MouseSettings.cpp
b/src/preferences/input/MouseSettings.cpp
index 042203bc3d..b9b2f8072d 100644
--- a/src/preferences/input/MouseSettings.cpp
+++ b/src/preferences/input/MouseSettings.cpp
@@ -147,7 +147,8 @@ MouseSettings::Dump()
printf("type:\t\t%" B_PRId32 " button mouse\n", fSettings.type);
printf("map:\t\tleft = %" B_PRIu32 " : middle = %" B_PRIu32 " : right =
%"
B_PRIu32 "\n", fSettings.map.button[0], fSettings.map.button[2],
- fSettings.map.button[1]);
+ fSettings.map.button[1], fSettings.map.button[3],
+ fSettings.map.button[4]);
printf("click speed:\t%" B_PRId64 "\n", fSettings.click_speed);
printf("accel:\t\t%s\n", fSettings.accel.enabled ? "enabled" :
"disabled");
printf("accel factor:\t%" B_PRId32 "\n", fSettings.accel.accel_factor);
@@ -203,6 +204,8 @@ MouseSettings::Defaults()
map.button[0] = B_PRIMARY_MOUSE_BUTTON;
map.button[1] = B_SECONDARY_MOUSE_BUTTON;
map.button[2] = B_TERTIARY_MOUSE_BUTTON;
+ map.button[3] = B_MOUSE_BUTTON(4);
+ map.button[4] = B_MOUSE_BUTTON(5);
SetMapping(map);
}
}
@@ -221,7 +224,9 @@ MouseSettings::IsDefaultable()
|| fAcceptFirstClick != kDefaultAcceptFirstClick
|| fSettings.map.button[0] != B_PRIMARY_MOUSE_BUTTON
|| fSettings.map.button[1] != B_SECONDARY_MOUSE_BUTTON
- || fSettings.map.button[2] != B_TERTIARY_MOUSE_BUTTON;
+ || fSettings.map.button[2] != B_TERTIARY_MOUSE_BUTTON
+ || fSettings.map.button[3] != B_MOUSE_BUTTON(4)
+ || fSettings.map.button[4] != B_MOUSE_BUTTON(5);
}
@@ -254,7 +259,9 @@ MouseSettings::IsRevertable()
|| fAcceptFirstClick != fOriginalAcceptFirstClick
|| fSettings.map.button[0] != fOriginalSettings.map.button[0]
|| fSettings.map.button[1] != fOriginalSettings.map.button[1]
- || fSettings.map.button[2] != fOriginalSettings.map.button[2];
+ || fSettings.map.button[2] != fOriginalSettings.map.button[2]
+ || fSettings.map.button[3] != fOriginalSettings.map.button[3]
+ || fSettings.map.button[4] != fOriginalSettings.map.button[4];
}
