diff --git a/src/Settings_Gui.ahk b/src/Settings_Gui.ahk index a912431..674a22b 100644 --- a/src/Settings_Gui.ahk +++ b/src/Settings_Gui.ahk @@ -481,7 +481,7 @@ } } - Hotkeys.Push This.S_Gui.Add("Text", " x115 yp+130 section", "Charactername:") + Hotkeys.Push This.S_Gui.Add("Text", " x115 yp+130 section", "Character Name:") HKCharList := This.S_Gui.Add("Edit", " xp-30 yp20 w180 h350 -Wrap vHotkeyCharList", Charlist) Hotkeys.Push HKCharList HKCharList.OnEvent("Change", (obj, *) => EventHandler(obj)) diff --git a/src/ThumbWindow.ahk b/src/ThumbWindow.ahk index b68160a..b278513 100644 --- a/src/ThumbWindow.ahk +++ b/src/ThumbWindow.ahk @@ -328,36 +328,40 @@ Class ThumbWindow extends Propertys { } } - ShowThumb(EVEWindowHwnd, HideOrShow) { - try - title := WinGetTitle("Ahk_Id " EVEWindowHwnd) - catch - title := 0 - if (!This.Thumbnail_visibility.Has(This.CleanTitle(title))) { - if (HideOrShow = "Show") { - for k, v in This.ThumbWindows.%EVEWindowHwnd% { - if (k = "Thumbnail") - continue - if (k = "Border" && !This.ShowAllColoredBorders) || (k = "TextOverlay" && !This.ShowThumbnailTextOverlay) - continue + ShowThumb(EVEWindowHwnd, HideOrShow) { + try + title := WinGetTitle("Ahk_Id " EVEWindowHwnd) + catch + title := 0 + if (!This.Thumbnail_visibility.Has(This.CleanTitle(title))) { + if (HideOrShow = "Show") { + for k, v in This.ThumbWindows.%EVEWindowHwnd% { + if (k = "Thumbnail") + continue + if (k = "Border" && !This.ShowAllColoredBorders) + continue + + This.ThumbWindows.%EVEWindowHwnd%[k].Show("NoActivate") - This.ThumbWindows.%EVEWindowHwnd%[k].Show("NoActivate") - This.ThumbWindows.%EVEWindowHwnd%["TextOverlay"].Show("NoActivate") - } - } - else { - if (This.ThumbWindows.%EVEWindowHwnd%["Window"].Title = "") { - This.ThumbWindows.%EVEWindowHwnd%["Border"].Show("Hide") - return - } - for k, v in This.ThumbWindows.%EVEWindowHwnd% { - if (k = "Thumbnail") - continue - This.ThumbWindows.%EVEWindowHwnd%[k].Show("Hide") - } - } - } - } + if (k = "TextOverlay" && !This.ShowThumbnailTextOverlay) + This.ThumbWindows.%EVEWindowHwnd%["TextOverlay"].Show("Hide") + else if (k = "TextOverlay" && This.ShowThumbnailTextOverlay) + This.ThumbWindows.%EVEWindowHwnd%["TextOverlay"].Show("NoActivate") + } + } + else { + if (This.ThumbWindows.%EVEWindowHwnd%["Window"].Title = "") { + This.ThumbWindows.%EVEWindowHwnd%["Border"].Show("Hide") + return + } + for k, v in This.ThumbWindows.%EVEWindowHwnd% { + if (k = "Thumbnail") + continue + This.ThumbWindows.%EVEWindowHwnd%[k].Show("Hide") + } + } + } + } Update_Thumb(AllOrOne := true, ThumbHwnd?) {