Skip to content

Commit 4a89855

Browse files
committed
Prevent unintended interactions between workspace and scrollbar/button
1 parent eba6584 commit 4a89855

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

scripts/control_draw/control_draw.gml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -836,13 +836,13 @@ if (!fullscreen) {
836836
} else {
837837
// horizontal rise animation
838838
if (mouse_rectangle(0, rh - 25, rw, rh)) {
839-
if (sbh_anim < 16) sbh_anim += (2 * 30 / room_speed)
839+
if (window = 0 && sbh_anim < 16) sbh_anim += (2 * 30 / room_speed)
840840
} else if (sb_drag = -1) {
841841
if (sbh_anim > 0) sbh_anim -= (2 * 30 / room_speed)
842842
}
843843
// vertical rise animation
844844
if (mouse_rectangle(rw - 25, 0, rw, rh)) {
845-
if (sbv_anim < 16) sbv_anim += (2 * 30 / room_speed)
845+
if (window = 0 && sbv_anim < 16) sbv_anim += (2 * 30 / room_speed)
846846
} else if (sb_drag = -1) {
847847
if (sbv_anim > 0) sbv_anim -= (2 * 30 / room_speed)
848848
}
@@ -865,6 +865,7 @@ if (theme = 2) draw_set_color(c_dark)
865865
draw_rectangle(xx, yy, xx + 16, yy + 16, false)
866866
if (draw_layericon(7 + fullscreen, xx, yy, condstr(!fullscreen, "Expand workspace", "Return"), 0, 0)) {
867867
fullscreen = !fullscreen
868+
dontplace = 1
868869
}
869870

870871
// Draw layers

0 commit comments

Comments
 (0)