From 50ac782a8b045599b818ebd6489576a57e3e52b5 Mon Sep 17 00:00:00 2001 From: MilleXIV Date: Sun, 21 Aug 2016 13:59:57 -0400 Subject: [PATCH] Travel Module completed --- locales/enUS.lua | 1 + modules/travel.lua | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/locales/enUS.lua b/locales/enUS.lua index 96eb596..fa0dc38 100644 --- a/locales/enUS.lua +++ b/locales/enUS.lua @@ -63,3 +63,4 @@ L['Open Calendar'] = true; L['Open Clock'] = true; L['Travel'] = true; +L['Port Options'] = true; diff --git a/modules/travel.lua b/modules/travel.lua index 50eab97..b131b13 100644 --- a/modules/travel.lua +++ b/modules/travel.lua @@ -55,6 +55,8 @@ function TravelModule:OnInitialize() end self.portButtons = {} + self.extraPadding = (xb.constants.popupPadding * 3) + self.optionTextExtra = 4 end function TravelModule:OnEnable() @@ -206,8 +208,15 @@ function TravelModule:CreatePortPopup() if not self.portPopup then return; end local db = xb.db.profile + self.portOptionString = self.portOptionString or self.portPopup:CreateFontString(nil, 'OVERLAY') + self.portOptionString:SetFont(xb.LSM:Fetch(xb.LSM.MediaType.FONT, db.text.font), db.text.fontSize + self.optionTextExtra) + self.portOptionString:SetTextColor(db.color.normal.r, db.color.normal.g, db.color.normal.b, db.color.normal.a) + self.portOptionString:SetText(L['Port Options']) + self.portOptionString:SetPoint('TOP', 0, -(xb.constants.popupPadding)) + self.portOptionString:SetPoint('CENTER') + local popupWidth = self.portPopup:GetWidth() - local popupHeight = xb.constants.popupPadding + local popupHeight = xb.constants.popupPadding + db.text.fontSize + self.optionTextExtra local changedWidth = false for i, v in ipairs(self.portOptions) do if self.portButtons[v.portId] == nil then @@ -259,18 +268,23 @@ function TravelModule:CreatePortPopup() if button.isSettable then button:SetPoint('LEFT', xb.constants.popupPadding, 0) button:SetPoint('TOP', 0, -(popupHeight + xb.constants.popupPadding)) + button:SetPoint('RIGHT') popupHeight = popupHeight + xb.constants.popupPadding + db.text.fontSize else button:Hide() end end -- for id/button in portButtons if changedWidth then - popupWidth = popupWidth + (xb.constants.popupPadding * 3) + popupWidth = popupWidth + self.extraPadding end if popupWidth < self.portButton:GetWidth() then popupWidth = self.portButton:GetWidth() end + + if popupWidth < (self.portOptionString:GetStringWidth() + self.extraPadding) then + popupWidth = (self.portOptionString:GetStringWidth() + self.extraPadding) + end self.portPopup:SetSize(popupWidth, popupHeight + xb.constants.popupPadding) end -- 1.7.9.5