Skip to content

Commit 9563985

Browse files
committed
Prevent WConfirmedButton and WConfirmedMinus from failing if you click too fast
Also refactor mouseClicked and onMouseClicked from WWidget as a parameter was misnamed
1 parent 0376f00 commit 9563985

13 files changed

Lines changed: 33 additions & 33 deletions

File tree

src/main/java/meteordevelopment/meteorclient/gui/screens/settings/ColorSettingScreen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ void calculateFromColor(Color c, boolean calculateNow) {
278278
}
279279

280280
@Override
281-
public boolean onMouseClicked(Click click, boolean used) {
282-
if (used) return false;
281+
public boolean onMouseClicked(Click click, boolean doubled) {
282+
if (doubled) return false;
283283

284284
if (mouseOver) {
285285
dragging = true;
@@ -550,8 +550,8 @@ void calculateColor() {
550550
}
551551

552552
@Override
553-
public boolean onMouseClicked(Click click, boolean used) {
554-
if (used) return false;
553+
public boolean onMouseClicked(Click click, boolean doubled) {
554+
if (doubled) return false;
555555

556556
if (mouseOver) {
557557
dragging = true;

src/main/java/meteordevelopment/meteorclient/gui/widgets/WLabel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ protected void onCalculateSize() {
2727
}
2828

2929
@Override
30-
public boolean onMouseClicked(Click click, boolean used) {
31-
if (action != null) return super.onMouseClicked(click, used);
30+
public boolean onMouseClicked(Click click, boolean doubled) {
31+
if (action != null) return super.onMouseClicked(click, doubled);
3232
return false;
3333
}
3434

src/main/java/meteordevelopment/meteorclient/gui/widgets/WWidget.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, doub
9191

9292
// Events
9393

94-
public boolean mouseClicked(Click click, boolean used) {
95-
return onMouseClicked(click, used);
94+
public boolean mouseClicked(Click click, boolean doubled) {
95+
return onMouseClicked(click, doubled);
9696
}
97-
public boolean onMouseClicked(Click click, boolean used) { return false; }
97+
public boolean onMouseClicked(Click click, boolean doubled) { return false; }
9898

9999
public boolean mouseReleased(Click click) {
100100
return onMouseReleased(click);

src/main/java/meteordevelopment/meteorclient/gui/widgets/containers/WContainer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ protected boolean propagateEvents(WWidget widget) {
127127
}
128128

129129
@Override
130-
public boolean mouseClicked(Click click, boolean used) {
130+
public boolean mouseClicked(Click click, boolean doubled) {
131131
try {
132132
for (Cell<?> cell : cells) {
133-
if (propagateEvents(cell.widget()) && cell.widget().mouseClicked(click, used))
134-
used = true;
133+
if (propagateEvents(cell.widget()) && cell.widget().mouseClicked(click, doubled))
134+
doubled = true;
135135
}
136136
} catch (ConcurrentModificationException ignored) {}
137137

138-
return super.mouseClicked(click, used) || used;
138+
return super.mouseClicked(click, doubled) || doubled;
139139
}
140140

141141
@Override

src/main/java/meteordevelopment/meteorclient/gui/widgets/containers/WSection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public WHeader(String title) {
124124
}
125125

126126
@Override
127-
public boolean onMouseClicked(Click click, boolean used) {
128-
if (mouseOver && click.button() == GLFW_MOUSE_BUTTON_LEFT && !used) {
127+
public boolean onMouseClicked(Click click, boolean doubled) {
128+
if (mouseOver && click.button() == GLFW_MOUSE_BUTTON_LEFT && !doubled) {
129129
onClick();
130130
return true;
131131
}

src/main/java/meteordevelopment/meteorclient/gui/widgets/containers/WView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ protected void onCalculateWidgetPositions() {
7575
}
7676

7777
@Override
78-
public boolean onMouseClicked(Click click, boolean used) {
79-
if (handleMouseOver && click.button() == GLFW_MOUSE_BUTTON_LEFT && !used) {
78+
public boolean onMouseClicked(Click click, boolean doubled) {
79+
if (handleMouseOver && click.button() == GLFW_MOUSE_BUTTON_LEFT && !doubled) {
8080
handlePressed = true;
8181
return true;
8282
}

src/main/java/meteordevelopment/meteorclient/gui/widgets/containers/WWindow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ protected void onCalculateSize() {
189189
}
190190

191191
@Override
192-
public boolean onMouseClicked(Click click, boolean used) {
193-
if (mouseOver && !used) {
192+
public boolean onMouseClicked(Click click, boolean doubled) {
193+
if (mouseOver && !doubled) {
194194
if (click.button() == GLFW_MOUSE_BUTTON_RIGHT) setExpanded(!expanded);
195195
else {
196196
dragging = true;

src/main/java/meteordevelopment/meteorclient/gui/widgets/input/WDropdown.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ public boolean render(GuiRenderer renderer, double mouseX, double mouseY, double
124124
// Events
125125

126126
@Override
127-
public boolean onMouseClicked(Click click, boolean used) {
127+
public boolean onMouseClicked(Click click, boolean doubled) {
128128
if (!mouseOver && !root.mouseOver) expanded = false;
129129

130-
if (super.onMouseClicked(click, used)) used = true;
131-
if (expanded && root.mouseClicked(click, used)) used = true;
130+
if (super.onMouseClicked(click, doubled)) doubled = true;
131+
if (expanded && root.mouseClicked(click, doubled)) doubled = true;
132132

133-
return used;
133+
return doubled;
134134
}
135135

136136
@Override

src/main/java/meteordevelopment/meteorclient/gui/widgets/input/WSlider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ protected void onCalculateSize() {
4343
}
4444

4545
@Override
46-
public boolean onMouseClicked(Click click, boolean used) {
47-
if (mouseOver && !used) {
46+
public boolean onMouseClicked(Click click, boolean doubled) {
47+
if (mouseOver && !doubled) {
4848
valueAtDragStart = value;
4949
double handleSize = handleSize();
5050

src/main/java/meteordevelopment/meteorclient/gui/widgets/input/WTextBox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ protected double maxTextWidth() {
108108
}
109109

110110
@Override
111-
public boolean onMouseClicked(Click click, boolean used) {
112-
if (mouseOver && !used) {
111+
public boolean onMouseClicked(Click click, boolean doubled) {
112+
if (mouseOver && !doubled) {
113113
if (click.button() == GLFW_MOUSE_BUTTON_RIGHT) {
114114
if (!text.isEmpty()) {
115115
text = "";

0 commit comments

Comments
 (0)