# HG changeset patch # User madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09 # Date 1367257498 0 # Node ID 3a3dc5e4405a6a1912a852dd1f606fbc6cc5cd22 # Parent 57d46de51ba79d660b0e41638d5cd7de1c07ddef Removed a level of frames for the minimap button, and improved some widgets naming a bit. diff -r 57d46de51ba7 -r 3a3dc5e4405a CyborgMMO7.lua --- a/CyborgMMO7.lua Mon Apr 29 17:44:53 2013 +0000 +++ b/CyborgMMO7.lua Mon Apr 29 17:44:58 2013 +0000 @@ -42,8 +42,8 @@ local r = 80 local dx = r * math.cos(angle) local dy = r * math.sin(angle) - CyborgMMO_MiniMapFrame:ClearAllPoints() - CyborgMMO_MiniMapFrame:SetPoint("CENTER", "Minimap", "CENTER", dx, dy) + CyborgMMO_MiniMapButton:ClearAllPoints() + CyborgMMO_MiniMapButton:SetPoint("CENTER", "Minimap", "CENTER", dx, dy) end @@ -59,8 +59,8 @@ end function CyborgMMO_MouseModeChange(mode) - local MiniMapTexture = getglobal("CyborgMMO_MiniMapFrameButton_Icon") - local MiniMapGlowTexture = getglobal("CyborgMMO_MiniMapFrameButton_IconGlow") + local MiniMapTexture = CyborgMMO_MiniMapButtonIcon + local MiniMapGlowTexture = CyborgMMO_MiniMapButtonIconGlow local OpenButtonTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetNormalTexture() local OpenButtonGlowTexture = getglobal("CyborgMMO_OpenButtonPage".."OpenMainForm"):GetHighlightTexture() if mode == 1 then @@ -456,9 +456,9 @@ function CyborgMMO_SetMiniMapButton(visible) if visible then - CyborgMMO_MiniMapFrameButton:Show() + CyborgMMO_MiniMapButton:Show() else - CyborgMMO_MiniMapFrameButton:Hide() + CyborgMMO_MiniMapButton:Hide() end CyborgMMO_OptionPageMiniMapButton:SetChecked(visible) if SettingsLoaded then diff -r 57d46de51ba7 -r 3a3dc5e4405a OpenButtonPage.xml --- a/OpenButtonPage.xml Mon Apr 29 17:44:53 2013 +0000 +++ b/OpenButtonPage.xml Mon Apr 29 17:44:58 2013 +0000 @@ -80,77 +80,67 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + self:RegisterForDrag("LeftButton", "RightButton") + + + + + CyborgMMO_Toggle() + if not CyborgMMO_IsOpen() then + CyborgMMO_RatQuickPage:Show() + end + + + if not CyborgMMO_IsOpen() then + CyborgMMO_RatQuickPage:Show() + end + CyborgMMO_ShowProfileTooltip(getglobal(self:GetName().."Icon")) + + + CyborgMMO_RatQuickPage:Hide() + CyborgMMO_HideProfileTooltip() + + + if self:IsDragging() then + CyborgMMO_MiniMapButtonOnUpdate() + end + + +