[haiku-commits] Change in haiku[master]: Added 6th button in Mouse GUI - Correct button size of 4 and 5 button...

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 24 Apr 2020 17:19:23 +0000

From Preetpal Kaur <preetpalok123@xxxxxxxxx>:

Preetpal Kaur has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2509 ;)


Change subject: Added 6th button in Mouse GUI - Correct button size of 4 and 5 
buttons in Mouse GUI.
......................................................................

Added 6th button in Mouse GUI
- Correct button size of 4 and 5 buttons in Mouse GUI.

Change-Id: I915077d11f9212c47c782fd9296b9f5b8909ed09
---
M src/preferences/input/MouseView.cpp
M src/preferences/input/SettingsView.cpp
2 files changed, 6 insertions(+), 4 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/09/2509/1

diff --git a/src/preferences/input/MouseView.cpp 
b/src/preferences/input/MouseView.cpp
index 38a53a2..f2ea8d1 100644
--- a/src/preferences/input/MouseView.cpp
+++ b/src/preferences/input/MouseView.cpp
@@ -36,12 +36,13 @@
 static const int32 kMouseDownHeight = 35;

 #define W kMouseDownWidth / 100
-static const int32 kButtonOffsets[][6] = {
+static const int32 kButtonOffsets[][7] = {
        { 0, 100 * W },
        { 0, 50 * W, 100 * W },
        { 0, 35 * W, 65 * W, 100 * W },
-       { 0, 27 * W, 54 * W, 81 * W, 100 * W },
-       { 0, 23 * W, 46 * W, 69 * W, 84 * W, 100 * W }
+       { 0, 25 * W, 50 * W, 75 * W, 100 * W },
+       { 0, 20 * W, 40 * W, 60 * W, 80 * W, 100 * W },
+       { 0, 19 * W, 34 * W, 50 * W, 66 * W, 82 * W, 100 * W }
 };
 #undef W

@@ -191,7 +192,7 @@
                BMessage message(kMsgMouseMap);
                message.AddInt32("button", button);

-               for (int i = 1; i < 6; i++) {
+               for (int i = 1; i < 7; i++) {
                        char tmp[2];
                        sprintf(tmp, "%d", i);
                        menu.AddItem(new BMenuItem(tmp, new BMessage(message)));
diff --git a/src/preferences/input/SettingsView.cpp 
b/src/preferences/input/SettingsView.cpp
index c5ec4ef..bdf3812 100644
--- a/src/preferences/input/SettingsView.cpp
+++ b/src/preferences/input/SettingsView.cpp
@@ -79,6 +79,7 @@
        fTypeMenu->AddOption(B_TRANSLATE("3-Button"), 3);
        fTypeMenu->AddOption(B_TRANSLATE("4-Button"), 4);
        fTypeMenu->AddOption(B_TRANSLATE("5-Button"), 5);
+       fTypeMenu->AddOption(B_TRANSLATE("6-Button"), 6);

        // Create the "Double-click speed slider...
        fClickSpeedSlider = new BSlider("double_click_speed",

--
To view, visit https://review.haiku-os.org/c/haiku/+/2509
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I915077d11f9212c47c782fd9296b9f5b8909ed09
Gerrit-Change-Number: 2509
Gerrit-PatchSet: 1
Gerrit-Owner: Preetpal Kaur <preetpalok123@xxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: Added 6th button in Mouse GUI - Correct button size of 4 and 5 button... - Gerrit