gui fixes
git [04-12-18 - 06:38]
diff --git a/DailyAutoShare/DASUserSettingsAdapter.lua b/DailyAutoShare/DASUserSettingsAdapter.lua
index abf1a2d..5743391 100644
--- a/DailyAutoShare/DASUserSettingsAdapter.lua
+++ b/DailyAutoShare/DASUserSettingsAdapter.lua
@@ -316,6 +316,8 @@ function DAS.LoadControlLocation(control)
control:ClearAnchors()
control:SetAnchor(TOPLEFT, GuiRoot, TOPLEFT, x, y)
+
+ DAS.SetTooltipRight(DAS.GetTooltipRight() or x < 200)
end
diff --git a/DailyAutoShare/DailyAutoShare.xml b/DailyAutoShare/DailyAutoShare.xml
index f406fe5..53a54d8 100644
--- a/DailyAutoShare/DailyAutoShare.xml
+++ b/DailyAutoShare/DailyAutoShare.xml
@@ -14,29 +14,29 @@
<Controls>
- <Backdrop name="$(parent)_BG" edgeColor="000000" centerColor="#FFD700" alpha="0.3" drawLayer="0">
+ <Backdrop name="$(parent)_BG" edgeColor="000000" centerColor="969696" alpha="0.5" drawLayer="0">
<Anchor point="TOPLEFT" relativeTo="$(parent)" relativePoint="TOPLEFT"/>
<Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMRIGHT"/>
</Backdrop>
<Button name="DasButtonLock" >
<Dimensions x="16" y="16" />
- <Anchor point="TOPLEFT" relativeTo="DasHandle" relativePoint="TOPLEFT" offsetX="10" offsetY="15"/>
+ <Anchor point="TOPLEFT" relativeTo="DasHandle" relativePoint="TOPLEFT" offsetX="15" offsetY="15"/>
<OnMouseUp> DailyAutoShare.SetLocked(not DailyAutoShare.GetLocked()) </OnMouseUp>
<Textures
- normal="/esoui/art/miscellaneous/locked_up.dds"
- pressed="/esoui/art/miscellaneous/locked_down.dds"
- mouseOver="/esoui/art/miscellaneous/locked_over.dds"
+ normal ="esoui/art/miscellaneous/locked_up.dds"
+ pressed ="esoui/art/miscellaneous/locked_down.dds"
+ mouseOver ="esoui/art/miscellaneous/locked_over.dds"
/>
</Button>
<Button name="DasButtonHide" >
<Dimensions x="15" y="15" />
- <Anchor point="LEFT" relativeTo="DasButtonLock" relativePoint="RIGHT" offsetX="10" offsetY="2"/>
+ <Anchor point="LEFT" relativeTo="DasButtonLock" relativePoint="RIGHT" offsetX="10" offsetY="1"/>
<Textures
- normal="DailyAutoShare/textures/x_up.dds"
- pressed="DailyAutoShare/textures/x_down.dds"
- mouseOver="DailyAutoShare/textures/x_down.dds"
+ normal ="/esoui/art/buttons/decline_up.dds"
+ pressed ="/esoui/art/buttons/decline_down.dds"
+ mouseOver ="/esoui/art/buttons/decline_over.dds"
/>
<OnMouseUp> DasControl:SetHidden(true) </OnMouseUp>
</Button>
@@ -44,13 +44,17 @@
<Button name="DasButtonMinmax" >
<Dimensions x="16" y="16" />
<Anchor point="TOPRIGHT" relativeTo="DasHandle" relativePoint="TOPRIGHT" offsetX="-20" offsetY="15"/>
-
+ <Textures
+ normal ="/esoui/art/buttons/minus_up.dds"
+ pressed ="/esoui/art/buttons/minus_down.dds"
+ mouseOver ="/esoui/art/buttons/minus_over.dds"
+ />
<OnMouseUp>DailyAutoShare.MinMaxButton()</OnMouseUp>
</Button>
<Button name="DasButtonRefresh">
- <Anchor point="RIGHT" relativeTo="DasHandle" relativePoint="RIGHT" offsetX="-40"/>
- <Dimensions x="20" y="20" />
+ <Anchor point="RIGHT" relativeTo="DasHandle" relativePoint="RIGHT" offsetX="-40" offsetY="1"/>
+ <Dimensions x="30" y="30" />
<Textures
normal ="/esoui/art/help/help_tabicon_feedback_up.dds"
pressed ="/esoui/art/help/help_tabicon_feedback_down.dds "
@@ -64,7 +68,7 @@
<Label name="$(parent)_Label" font="ZoFontWinH2" color="ffffff" text="DailyAutoShare"
verticalAlignment="CENTER" horizontalAlignment="LEFT" alpha="0.85">
<Dimensions x="350" y="50" />
- <Anchor point="TOPLEFT" relativeTo="DasHandle" relativePoint="TOPLEFT" offsetX="60" offsetY="0"/>
+ <Anchor point="TOPLEFT" relativeTo="DasHandle" relativePoint="TOPLEFT" offsetX="80" offsetY="-2"/>
</Label>
</Controls>
diff --git a/DailyAutoShare/DasGui.lua b/DailyAutoShare/DasGui.lua
index c4715a3..e2a0391 100644
--- a/DailyAutoShare/DasGui.lua
+++ b/DailyAutoShare/DasGui.lua
@@ -75,9 +75,9 @@ local function SetLockedButton(value)
end
local function SetMinimizedButton(value)
- local upsideDown = DAS.GetUpsideDown()
- local minimizedTex = "DailyAutoShare/textures/" .. tostring((upsideDown and "up") or "down")
- local maximizedTex = "DailyAutoShare/textures/" .. tostring((upsideDown and "down") or "up")
+
+ local minimizedTex = "/esoui/art/buttons/plus"
+ local maximizedTex = "/esoui/art/buttons/minus"
local tex = (value and minimizedTex) or maximizedTex
DasButtonMinmax:SetNormalTexture(tex.. "_up.dds")
DasButtonMinmax:SetMouseOverTexture(tex.. "_over.dds")
@@ -86,15 +86,16 @@ local function SetMinimizedButton(value)
end
function DAS.QuestButtonClicked(control, mouseButton)
+
+ if mouseButton == MOUSE_BUTTON_INDEX_RIGHT then -- and isValidJournalIndex then
+ return DAS.OnRightClick(control)
+ end
+
local journalIndex = control["dataJournalIndex"]
local isValidJournalIndex = IsValidQuestIndex(journalIndex)
- if mouseButton == MOUSE_BUTTON_INDEX_LEFT and isValidJournalIndex then
-
- ShareQuest(journalIndex)
-
- elseif mouseButton == MOUSE_BUTTON_INDEX_RIGHT then -- and isValidJournalIndex then
- DAS.OnRightClick(control)
+ if isValidJournalIndex then
+ ShareQuest(journalIndex)
end
end
diff --git a/DailyAutoShare/DasTooltip.lua b/DailyAutoShare/DasTooltip.lua
index 29d2580..8cdb5fa 100644
--- a/DailyAutoShare/DasTooltip.lua
+++ b/DailyAutoShare/DasTooltip.lua
@@ -28,20 +28,6 @@ function DAS.SetTooltipText(control)
SetTooltipText(control)
end
-function DAS.CreateControlTooltip(control)
-
- DailyAutoShare_Tooltip:ClearAnchors()
- local controlSettings = DAS.GetSettings().DasControl
- local anchorX = controlSettings.x > 100 and RIGHT or LEFT
- local anchorY = controlSettings.y > 100 and BOTTOM or TOP
-
- local anchorParent = anchorX + anchorY == TOPLEFT and TOP or BOTTOM
-
- DailyAutoShare_Tooltip:SetAnchor(anchorX + anchorY, DasHeader, anchorParent)
-
- SetTooltipText(control)
-
-end
local function setTooltipOffset(control)
local offsetY = control:GetTop() - DasList:GetTop()
@@ -54,10 +40,16 @@ local function setTooltipOffset(control)
DailyAutoShare_Tooltip:SetAnchor(myAnchorPos, DasList, parentAnchorPos, 0, offsetY)
end
-function DAS.CreateTooltip(control)
+function DAS.CreateControlTooltip(control)
- setTooltipOffset(control)
+ SetTooltipText(control)
+ setTooltipOffset(DasHeader)
+
+end
+
+function DAS.CreateTooltip(control)
+ setTooltipOffset(control)
SetTooltipText(control, isButton)
end