From 9a625492563e6c745cd41f18f7ec79850650b72a Mon Sep 17 00:00:00 2001 From: Cruor Date: Sat, 15 Jan 2022 14:52:30 +0100 Subject: [PATCH] Hotfix for new users. Fixed buttons during initial startup not doing anything. Issue introduced by JuliaGraphics/Gtk.jl#607. Added color names to room window color field tooltip. Fixed left clicking with circle tool not working. --- lang/en_gb.lang | 2 +- src/Ahorn.jl | 2 ++ src/tools/circles.jl | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lang/en_gb.lang b/lang/en_gb.lang index 2f9b8b7..85a2ef8 100644 --- a/lang/en_gb.lang +++ b/lang/en_gb.lang @@ -800,7 +800,7 @@ room_window.tooltips.delayAltMusicFade=Delay the alternative music fade. room_window.tooltips.music=What song should be playing in the room, uses previous if left empty. room_window.tooltips.altMusic=What alternative song should be playing. It is unsure what this means, as it seems to not be hooked up in the game anymore. room_window.tooltips.windPattern=The type of wind in the room. -room_window.tooltips.color=The colour of the room in the debug map viewer. +room_window.tooltips.color=The colour of the room in the debug map viewer.\n0 - White\n1 - Red\n2 - Green\n3 - Light Blue\n4 - Dark Blue\n5 - Purple\n6 - Pink room_window.tooltips.cameraOffsetX=Global horizontal offset of camera in room. room_window.tooltips.cameraOffsetY=Global vertical offset of camera in room. diff --git a/src/Ahorn.jl b/src/Ahorn.jl index 87fe240..d12a154 100644 --- a/src/Ahorn.jl +++ b/src/Ahorn.jl @@ -7,6 +7,8 @@ if Sys.iswindows() ENV["GTK_CSD"] = get(ENV, "GTK_CSD", "0") end +ENV["GTK_AUTO_IDLE"] = get(ENV, "GTK_AUTO_IDLE", "false") + using Gtk, Gtk.ShortNames, Gtk.GConstants using Cairo using Maple diff --git a/src/tools/circles.jl b/src/tools/circles.jl index 659ba0e..1da6836 100644 --- a/src/tools/circles.jl +++ b/src/tools/circles.jl @@ -122,7 +122,7 @@ function layersChanged(layers::Array{Ahorn.Layer, 1}) end function leftClick(x::Number, y::Number) - if cirlce !== nothing + if circle !== nothing applyCircle!(circle, material) global circle = nothing