Skip to content

Commit cfea35c

Browse files
committed
Prevented anything other than left click triggering BilgeButtons.
1 parent ca07c33 commit cfea35c

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

Source/Controls/BilgeButton.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,13 @@ protected override void OnPaint(PaintEventArgs e) {
116116
e.Graphics.DrawImageTranslucent(Image, Selected ? 1 : .75f, imageX - offset, imageY - offset);
117117
}
118118

119+
protected override void OnClick(EventArgs e) {
120+
// Only allow left click to raise click event.
121+
if ((e as MouseEventArgs)?.Button.HasFlag(MouseButtons.Left) ?? false) {
122+
base.OnClick(e);
123+
}
124+
}
125+
119126
private void BilgeButton_Click(object sender, EventArgs e) {
120127
if (ToggleButton) {
121128
Selected = !Selected;
@@ -133,13 +140,13 @@ private void BilgeButton_MouseLeave(object sender, EventArgs e) {
133140
}
134141

135142
private void BilgeButton_MouseDown(object sender, MouseEventArgs e) {
136-
if ((e.Button & MouseButtons.Left) > 0) {
143+
if (e.Button.HasFlag(MouseButtons.Left)) {
137144
IsMouseDown = true;
138145
}
139146
}
140147

141148
private void BilgeButton_MouseUp(object sender, MouseEventArgs e) {
142-
if ((e.Button & MouseButtons.Left) > 0) {
149+
if (e.Button.HasFlag(MouseButtons.Left)) {
143150
IsMouseDown = false;
144151
}
145152
}

Source/Forms/NetGraphForm.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private void settings_Click(object sender, EventArgs e) {
217217
}
218218

219219
private void trayIcon_MouseClick(object sender, MouseEventArgs e) {
220-
if ((e.Button & MouseButtons.Left) > 0) {
220+
if (e.Button.HasFlag(MouseButtons.Left)) {
221221
ToggleWindowVisibility();
222222
}
223223
}
@@ -241,14 +241,14 @@ private void NetGraphForm_Resize(object sender, EventArgs e) {
241241

242242
private void NetGraphForm_MouseDown(object sender, MouseEventArgs e) {
243243
// Record drag start location.
244-
if ((e.Button & MouseButtons.Left) > 0) {
244+
if (e.Button.HasFlag(MouseButtons.Left)) {
245245
dragPoint = e.Location;
246246
}
247247
}
248248

249249
private void NetGraphForm_MouseMove(object sender, MouseEventArgs e) {
250250
// Drag form.
251-
if ((e.Button & MouseButtons.Left) > 0) {
251+
if (e.Button.HasFlag(MouseButtons.Left)) {
252252
var container = Screen.FromRectangle(Bounds).WorkingArea;
253253
var x = Location.X + e.X - dragPoint.X;
254254
var y = Location.Y + e.Y - dragPoint.Y;

0 commit comments

Comments
 (0)