diff --git a/KeyUI.lua b/KeyUI.lua index 58acf54..71e9f1a 100644 --- a/KeyUI.lua +++ b/KeyUI.lua @@ -480,12 +480,12 @@ function addon:CreateTooltip() keyui_tooltip_frame.key = keyui_tooltip_frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") keyui_tooltip_frame.key:SetPoint("CENTER", keyui_tooltip_frame, "CENTER", 0, 10) keyui_tooltip_frame.key:SetTextColor(1, 1, 1) - keyui_tooltip_frame.key:SetFont("Fonts\\ARIALN.TTF", 16) + keyui_tooltip_frame.key:SetFont("Interface\\AddOns\\KeyUI\\Media\\Fonts\\Expressway Regular.TTF", 16) keyui_tooltip_frame.binding = keyui_tooltip_frame:CreateFontString(nil, "OVERLAY", "GameFontNormal") keyui_tooltip_frame.binding:SetPoint("CENTER", keyui_tooltip_frame, "CENTER", 0, -10) keyui_tooltip_frame.binding:SetTextColor(1, 1, 1) - keyui_tooltip_frame.binding:SetFont("Fonts\\ARIALN.TTF", 16) + keyui_tooltip_frame.binding:SetFont("Interface\\AddOns\\KeyUI\\Media\\Fonts\\Expressway Regular.TTF", 16) -- Hide the GameTooltip when this custom tooltip hides. keyui_tooltip_frame:SetScript("OnHide", function() GameTooltip:Hide() end) @@ -502,10 +502,13 @@ function addon:ButtonMouseOver(button) addon.keyui_tooltip_frame:SetPoint("LEFT", button, "RIGHT", 6, 0) -- Position for the Addon Tooltip - if short_modifier_string[key] then + -- Check if the key is in the no_modifier_keys list + if addon.no_modifier_keys[key] then + -- If the key is in the no_modifier_keys list, don't add the modifier string addon.keyui_tooltip_frame.key:SetText(key) else - addon.keyui_tooltip_frame.key:SetText(short_modifier_string .. key or "") + -- If it's not a no-modifier key, combine the modifier string with the key + addon.keyui_tooltip_frame.key:SetText(short_modifier_string .. key) end addon.keyui_tooltip_frame.binding:SetText(readable_binding or "") @@ -753,6 +756,10 @@ function addon:SetKey(button) -- Set the short key format if button.short_key exists if button.short_key then + + -- Adjust the width of the short_key based on button width + button.short_key:SetWidth(button:GetWidth() - 6) + -- Check if the key should be displayed without modifiers if addon.no_modifier_keys[original_text] then -- If the key is in the no_modifier_keys list, display it without modifiers @@ -776,6 +783,19 @@ function addon:SetKey(button) end end end + + -- Calculate the maximum allowed characters based on button width + local max_allowed_chars = math.floor(button:GetWidth() / 8) + local combined_text = button.short_key:GetText() -- Combined text with modifiers if present + + -- Use Condensed font if the combined text exceeds max_allowed_chars + if string.len(combined_text) > max_allowed_chars then + -- Use the Condensed font for longer text + button.short_key:SetFont("Interface\\AddOns\\KeyUI\\Media\\Fonts\\Expressway Condensed.TTF", 16, "OUTLINE") + else + -- Use the Regular font for shorter text + button.short_key:SetFont("Interface\\AddOns\\KeyUI\\Media\\Fonts\\Expressway Regular.TTF", 16, "OUTLINE") + end end end @@ -903,6 +923,9 @@ function addon:create_action_labels() if keyboard_button.readable_binding then local command = keyboard_button.binding + -- Adjust the width of the readable_binding based on button width + keyboard_button.readable_binding:SetWidth(keyboard_button:GetWidth() - 4) + -- Check if the command corresponds to a Dominos action button if command and command:match("CLICK DominosActionButton(%d+):HOTKEY") then -- Handle the binding for Dominos action buttons @@ -940,6 +963,9 @@ function addon:create_action_labels() if mouse_button.readable_binding then local command = mouse_button.binding + -- Adjust the width of the readable_binding based on button width + mouse_button.readable_binding:SetWidth(mouse_button:GetWidth() - 4) + -- Check if the command corresponds to a Dominos action button if command and command:match("CLICK DominosActionButton(%d+):HOTKEY") then -- Handle the binding for Dominos action buttons diff --git a/KeyboardFrame.lua b/KeyboardFrame.lua index 5599217..62bdecb 100644 --- a/KeyboardFrame.lua +++ b/KeyboardFrame.lua @@ -929,10 +929,9 @@ function addon:CreateKeyboardButtons() -- Keyboard Keybind text string on the top right of the button (e.g. a-c-s-1) keyboard_button.short_key = keyboard_button:CreateFontString(nil, "OVERLAY", "GameFontNormal") - keyboard_button.short_key:SetFont("Fonts\\ARIALN.TTF", 15, "OUTLINE") keyboard_button.short_key:SetTextColor(1, 1, 1) keyboard_button.short_key:SetHeight(20) - keyboard_button.short_key:SetWidth(70) + --keyboard_button.short_key:SetWidth(52) -- will be calculated in addon:SetKey keyboard_button.short_key:SetPoint("TOPRIGHT", keyboard_button, "TOPRIGHT", -4, -6) keyboard_button.short_key:SetJustifyH("RIGHT") keyboard_button.short_key:SetJustifyV("TOP") @@ -940,10 +939,10 @@ function addon:CreateKeyboardButtons() -- Font string to display the interface action text (toggled by function addon:create_action_labels) keyboard_button.readable_binding = keyboard_button:CreateFontString(nil, "OVERLAY", "GameFontNormal") - keyboard_button.readable_binding:SetFont("Fonts\\ARIALN.TTF", 12, "OUTLINE") + keyboard_button.readable_binding:SetFont("Interface\\AddOns\\KeyUI\\Media\\Fonts\\Expressway Condensed.TTF", 12, "OUTLINE") keyboard_button.readable_binding:SetTextColor(1, 1, 1) keyboard_button.readable_binding:SetHeight(30) - keyboard_button.readable_binding:SetWidth(56) + --keyboard_button.readable_binding:SetWidth(56) -- will be calculated in addon:create_action_labels keyboard_button.readable_binding:SetPoint("BOTTOM", keyboard_button, "BOTTOM", 1, 6) keyboard_button.readable_binding:SetJustifyV("BOTTOM") keyboard_button.readable_binding:SetText("") @@ -1146,7 +1145,7 @@ function addon:KeyboardLayoutSelecter() elseif layout == "Cyborg_II" then info.text = "Cyborg II" elseif layout == "Moonlander_MK_I" then - info.text = "Moonlander Default Layout" + info.text = "Moonlander Mark I" else info.text = layout -- For other layouts, keep the original text end diff --git a/LayoutsKeyboard.lua b/LayoutsKeyboard.lua index 46b930f..b5a65a1 100644 --- a/LayoutsKeyboard.lua +++ b/LayoutsKeyboard.lua @@ -3459,11 +3459,11 @@ addon.default_keyboard_layouts = { { 'E', 192, -68, u, u }, { 'R', 254, -72, u, u }, { 'T', 316, -76, u, u }, - { 'N/A', 378, -80, u, u }, + { 'Custom', 378, -80, u, u }, -- Row 2 right half - { 'N/A', 750, -80, u, u }, + { 'Custom', 750, -80, u, u }, { 'Y', 812, -76, u, u }, { 'U', 874, -72, u, u }, { 'I', 936, -68, u, u }, @@ -3479,11 +3479,11 @@ addon.default_keyboard_layouts = { { 'D', 192, -130, u, u }, { 'F', 254, -134, u, u }, { 'G', 316, -138, u, u }, - { 'N/A', 378, -142, u, u }, + { 'Custom', 378, -142, u, u }, -- Row 3 right half - { 'N/A', 750, -142, u, u }, + { 'Custom', 750, -142, u, u }, { 'H', 812, -138, u, u }, { 'J', 874, -134, u, u }, { 'K', 936, -130, u, u }, @@ -3499,7 +3499,7 @@ addon.default_keyboard_layouts = { { 'C', 192, -192, u, u }, { 'V', 254, -196, u, u }, { 'B', 316, -200, u, u }, - -- { 'N/A', 378, -142, u, u }, + -- { 'Custom', 378, -142, u, u }, -- Row 4 right half @@ -3509,17 +3509,17 @@ addon.default_keyboard_layouts = { { '.', 998, -196, u, u }, { '/', 1060, -200, u, u }, { 'RSHIFT', 1122, -204, u, u }, - -- { 'N/A', 1184, -142, u, u }, + -- { 'Custom', 1184, -142, u, u }, -- Row 5 left half { '`', 6, -266, u, u }, { 'CAPSLOCK', 68, -262, u, u }, - { 'N/A', 130, -258, u, u }, + { 'Custom', 130, -258, u, u }, { 'LEFT', 192, -254, u, u }, { 'RIGHT', 254, -258, u, u }, -- { 'B', 316, -200, u, u }, - -- { 'N/A', 378, -142, u, u }, + -- { 'Custom', 378, -142, u, u }, -- Row 5 right half @@ -3527,9 +3527,9 @@ addon.default_keyboard_layouts = { { 'DOWN', 936, -254, u, u }, { '[', 998, -258, u, u }, { ']', 1060, -262, u, u }, - { 'N/A', 1122, -266, u, u }, + { 'Custom', 1122, -266, u, u }, -- { 'B', 1184, -200, u, u }, - -- { 'N/A', 1246, -142, u, u }, + -- { 'Custom', 1246, -142, u, u }, -- -- Left Thumb Area { 'LALT', 378, -266, u2, u }, diff --git a/LayoutsMouse.lua b/LayoutsMouse.lua index 0c92722..1c0669b 100644 --- a/LayoutsMouse.lua +++ b/LayoutsMouse.lua @@ -4,150 +4,150 @@ addon.default_mouse_layouts = { ['Layout_4x3'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, - - { 'F1', -90, 80, 50, 50 }, - { 'F4', -90, 30, 50, 50 }, - { 'F7', -90, -20, 50, 50 }, - { 'F10', -90, -70, 50, 50 }, - - { 'F2', -40, 80, 50, 50 }, - { 'F5', -40, 30, 50, 50 }, - { 'F8', -40, -20, 50, 50 }, - { 'F11', -40, -70, 50, 50 }, - - { 'F3', 10, 80, 50, 50 }, - { 'F6', 10, 30, 50, 50 }, - { 'F9', 10, -20, 50, 50 }, - { 'F12', 10, -70, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, + + { 'F1', -100, 80, 50, 50 }, + { 'F4', -100, 30, 50, 50 }, + { 'F7', -100, -20, 50, 50 }, + { 'F10', -100, -70, 50, 50 }, + + { 'F2', -50, 80, 50, 50 }, + { 'F5', -50, 30, 50, 50 }, + { 'F8', -50, -20, 50, 50 }, + { 'F11', -50, -70, 50, 50 }, + + { 'F3', 0, 80, 50, 50 }, + { 'F6', 0, 30, 50, 50 }, + { 'F9', 0, -20, 50, 50 }, + { 'F12', 0, -70, 50, 50 }, }, ['Layout_2+4x3'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, - - { '', 60, 170, 50, 50 }, - { '', 60, 123, 50, 50 }, - - { 'F1', -90, 80, 50, 50 }, - { 'F4', -90, 30, 50, 50 }, - { 'F7', -90, -20, 50, 50 }, - { 'F10', -90, -70, 50, 50 }, - - { 'F2', -40, 80, 50, 50 }, - { 'F5', -40, 30, 50, 50 }, - { 'F8', -40, -20, 50, 50 }, - { 'F11', -40, -70, 50, 50 }, - - { 'F3', 10, 80, 50, 50 }, - { 'F6', 10, 30, 50, 50 }, - { 'F9', 10, -20, 50, 50 }, - { 'F12', 10, -70, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, + + { 'N/A', 60, 167, 50, 50 }, + { 'N/A', 60, 120, 50, 50 }, + + { 'F1', -100, 80, 50, 50 }, + { 'F4', -100, 30, 50, 50 }, + { 'F7', -100, -20, 50, 50 }, + { 'F10', -100, -70, 50, 50 }, + + { 'F2', -50, 80, 50, 50 }, + { 'F5', -50, 30, 50, 50 }, + { 'F8', -50, -20, 50, 50 }, + { 'F11', -50, -70, 50, 50 }, + + { 'F3', 0, 80, 50, 50 }, + { 'F6', 0, 30, 50, 50 }, + { 'F9', 0, -20, 50, 50 }, + { 'F12', 0, -70, 50, 50 }, }, ['Layout_3x3'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, - { 'F1', -90, 55, 50, 50 }, - { 'F4', -90, 5, 50, 50 }, - { 'F7', -90, -45, 50, 50 }, + { 'F1', -100, 55, 50, 50 }, + { 'F4', -100, 5, 50, 50 }, + { 'F7', -100, -45, 50, 50 }, - { 'F2', -40, 55, 50, 50 }, - { 'F5', -40, 5, 50, 50 }, - { 'F8', -40, -45, 50, 50 }, + { 'F2', -50, 55, 50, 50 }, + { 'F5', -50, 5, 50, 50 }, + { 'F8', -50, -45, 50, 50 }, - { 'F3', 10, 55, 50, 50 }, - { 'F6', 10, 5, 50, 50 }, - { 'F9', 10, -45, 50, 50 }, + { 'F3', 0, 55, 50, 50 }, + { 'F6', 0, 5, 50, 50 }, + { 'F9', 0, -45, 50, 50 }, }, ['Layout_3x2'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, - { 'F1', -40, 55, 50, 50 }, - { 'F3', -40, 5, 50, 50 }, - { 'F5', -40, -45, 50, 50 }, + { 'F1', -50, 55, 50, 50 }, + { 'F3', -50, 5, 50, 50 }, + { 'F5', -50, -45, 50, 50 }, - { 'F2', 10, 55, 50, 50 }, - { 'F4', 10, 5, 50, 50 }, - { 'F6', 10, -45, 50, 50 }, + { 'F2', 0, 55, 50, 50 }, + { 'F4', 0, 5, 50, 50 }, + { 'F6', 0, -45, 50, 50 }, }, ['Layout_1+2x2'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, - { 'F1', -15, 55, 50, 50 }, + { 'F1', -25, 55, 50, 50 }, - { 'F3', -40, 5, 50, 50 }, - { 'F5', -40, -45, 50, 50 }, + { 'F3', -50, 5, 50, 50 }, + { 'F5', -50, -45, 50, 50 }, - { 'F4', 10, 5, 50, 50 }, - { 'F6', 10, -45, 50, 50 }, + { 'F4', 0, 5, 50, 50 }, + { 'F6', 0, -45, 50, 50 }, }, ['Layout_2x2'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, - { 'F1', -40, 30, 50, 50 }, - { 'F2', -40, -20, 50, 50 }, + { 'F1', -50, 30, 50, 50 }, + { 'F2', -50, -20, 50, 50 }, - { 'F3', 10, 30, 50, 50 }, - { 'F4', 10, -20, 50, 50 }, + { 'F3', 0, 30, 50, 50 }, + { 'F4', 0, -20, 50, 50 }, }, ['Layout_2x1'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, - { 'F1', 10, 30, 50, 50 }, - { 'F2', 10, -20, 50, 50 }, + { 'F1', 0, 30, 50, 50 }, + { 'F2', 0, -20, 50, 50 }, }, ['Layout_Circle'] = { - { 'MOUSEWHEELUP', 140, 170, 50, 50 }, - { 'BUTTON3', 140, 123, 50, 50 }, - { 'MOUSEWHEELDOWN', 140, 76, 50, 50 }, - { '', 140, 29, 50, 50 }, - { '', 140, -16, 50, 50 }, - - { 'F1', -60, 65, 50, 50 }, - { 'F2', -10, 55, 50, 50 }, - { 'F3', 10, 5, 50, 50 }, - { 'F7', -10, -45, 50, 50 }, - { 'F6', -60, -55, 50, 50 }, - { 'F5', -110, -20, 50, 50 }, - { 'F4', -110, 30, 50, 50 } } + { 'MOUSEWHEELUP', 138, 167, 50, 50 }, + { 'BUTTON3', 138, 120, 50, 50 }, + { 'MOUSEWHEELDOWN', 138, 73, 50, 50 }, + { 'N/A', 138, 26, 50, 50 }, + { 'N/A', 138, -21, 50, 50 }, + + { 'F1', -70, 65, 50, 50 }, + { 'F2', -20, 55, 50, 50 }, + { 'F3', 0, 5, 50, 50 }, + { 'F7', -20, -45, 50, 50 }, + { 'F6', -70, -55, 50, 50 }, + { 'F5', -120, -20, 50, 50 }, + { 'F4', -120, 30, 50, 50 } } } diff --git a/Mappings.lua b/Mappings.lua index 3bd84f3..dc59c48 100644 --- a/Mappings.lua +++ b/Mappings.lua @@ -358,6 +358,7 @@ addon.binding_mapping = { -- List of buttons that should not be modified addon.no_modifier_keys = { ["ESCAPE"] = true, + ["ESC"] = true, ["LSHIFT"] = true, ["LCTRL"] = true, ["LALT"] = true, @@ -369,6 +370,8 @@ addon.no_modifier_keys = { ["LMETA"] = true, ["RMETA"] = true, ["MENU"] = true, + ["N/A"] = true, + ["Custom"] = true, } -- List of buttons that should not be highlighted when empty @@ -392,6 +395,7 @@ addon.no_highlight = { ["LMETA"] = true, ["RMETA"] = true, ["N/A"] = true, + ["Custom"] = true, } addon.short_keys = { @@ -429,7 +433,6 @@ addon.short_keys = { ["LMETA"] = "META", ["RMETA"] = "META", ["TAB"] = "Tab", - ["N/A"] = "Custom", } addon.action_slot_mapping = { diff --git a/Media/Fonts/Expressway Condensed.ttf b/Media/Fonts/Expressway Condensed.ttf new file mode 100644 index 0000000..8ba6ad0 Binary files /dev/null and b/Media/Fonts/Expressway Condensed.ttf differ diff --git a/Media/Fonts/Expressway Regular.ttf b/Media/Fonts/Expressway Regular.ttf new file mode 100644 index 0000000..a87ed80 Binary files /dev/null and b/Media/Fonts/Expressway Regular.ttf differ diff --git a/MouseFrame.lua b/MouseFrame.lua index 577e5c2..72b9540 100644 --- a/MouseFrame.lua +++ b/MouseFrame.lua @@ -18,7 +18,7 @@ function addon:CreateMouseImage() end mouse_image:SetWidth(260) - mouse_image:SetHeight(400) + mouse_image:SetHeight(382) mouse_image:Hide() -- Load the saved position if it exists @@ -43,7 +43,7 @@ function addon:CreateMouseImage() mouse_image.Texture = mouse_image:CreateTexture() mouse_image.Texture:SetTexture("Interface\\AddOns\\KeyUI\\Media\\Mouse.tga") mouse_image.Texture:SetPoint("Center", mouse_image, "Center", 0, 0) - mouse_image.Texture:SetSize(370, 370) + mouse_image.Texture:SetSize(390, 390) return mouse_image end @@ -71,8 +71,7 @@ function addon:CreateMouseFrame() end function addon:CreateMouseControl() - local mouse_control_frame = CreateFrame("Frame", "keyui_mouse_control_frame", addon.mouse_image, - "TooltipBorderedFrameTemplate") + local mouse_control_frame = CreateFrame("Frame", "keyui_mouse_control_frame", addon.mouse_image, "TooltipBorderedFrameTemplate") addon.mouse_control_frame = mouse_control_frame -- Manage ESC key behavior based on the setting @@ -634,10 +633,9 @@ function addon:CreateMouseButtons() -- Mouse Keybind text string on the top right of the button (e.g. a-c-s-1) mouse_button.short_key = mouse_button:CreateFontString(nil, "OVERLAY", "GameFontNormal") - mouse_button.short_key:SetFont("Fonts\\ARIALN.TTF", 12, "OUTLINE") mouse_button.short_key:SetTextColor(1, 1, 1) mouse_button.short_key:SetHeight(20) - mouse_button.short_key:SetWidth(42) + --mouse_button.short_key:SetWidth(42) -- will be calculated in addon:SetKey mouse_button.short_key:SetPoint("TOPRIGHT", mouse_button, "TOPRIGHT", -6, -6) mouse_button.short_key:SetJustifyH("RIGHT") mouse_button.short_key:SetJustifyV("TOP") @@ -645,10 +643,10 @@ function addon:CreateMouseButtons() -- Font string to display the interface action text (toggled by function addon:create_action_labels) mouse_button.readable_binding = mouse_button:CreateFontString(nil, "OVERLAY", "GameFontNormal") - mouse_button.readable_binding:SetFont("Fonts\\ARIALN.TTF", 10, "OUTLINE") + mouse_button.readable_binding:SetFont("Interface\\AddOns\\KeyUI\\Media\\Fonts\\Expressway Condensed.TTF", 12, "OUTLINE") mouse_button.readable_binding:SetTextColor(1, 1, 1) mouse_button.readable_binding:SetHeight(25) - mouse_button.readable_binding:SetWidth(46) + --mouse_button.readable_binding:SetWidth(46) -- will be calculated in addon:create_action_labels mouse_button.readable_binding:SetPoint("BOTTOM", mouse_button, "BOTTOM", 1, 6) mouse_button.readable_binding:SetJustifyV("BOTTOM") mouse_button.readable_binding:SetText("") @@ -809,13 +807,11 @@ function addon:MouseLayoutSelecter() end wipe(keyui_settings.layout_current_mouse) keyui_settings.layout_current_mouse[name] = layout - addon:refresh_keys() + addon:refresh_layouts() UIDropDownMenu_SetText(self, name) end UIDropDownMenu_AddButton(info, level) end - else - return end end