Merge branch 'master' of git@git.esoui.com:eso-History-90
His Dad [01-31-17 - 08:58]
Merge branch 'master' of git@git.esoui.com:eso-History-90
diff --git a/HistOffline.lua b/HistOffline.lua
index f1a9d25..c23dadb 100644
--- a/HistOffline.lua
+++ b/HistOffline.lua
@@ -320,7 +320,7 @@ end
}
-- Mouseover
- dung.Grp[i].box.dat=Grp_Dat[i]
+ dung.Grp[i].box.dat = Grp_Dat[i]
dung.Grp[i].box.mousemove_cb = box_mousemove_funct
--set lines Heading
@@ -368,7 +368,7 @@ end
iup.fill{},
}
- dung.Craglorn[i].box.dat=Craglorn_Dat[i]
+ dung.Craglorn[i].box.dat = Craglorn_Dat[i]
dung.Craglorn[i].box.mousemove_cb = box_mousemove_funct
--set lines Heading
@@ -462,6 +462,8 @@ end
me.Grp[i] = {} -- Dungeon data storage
me.Grp[i].vet = Grp_Dat[i].vet
me.Grp[i].box = iup.matrix {numcol=4, numcol_visible=4, numlin=5, widthdef=100}
+ me.Grp[i].box.dat = Grp_Dat[i] -- for mouseover
+ me.Grp[i].box.mousemove_cb = box_mousemove_funct
--Set Column titles in box
for j=1, 4 do
@@ -1127,7 +1129,7 @@ iup.Append(accounts[acc].char_tabs, accounts[acc].log_tab)
dung.DLC.box = iup.matrix {numcol=#accounts[acc].playerIDs , numlin=#DLC2key, widthdef=100}
- dung.DLC.box.dat=DLC_Dat
+ dung.DLC.box.dat = DLC_Dat
dung.DLC.box.mousemove_cb = box_mousemove_funct
--Set Line titles
@@ -1174,7 +1176,7 @@ iup.Append(accounts[acc].char_tabs, accounts[acc].log_tab)
dung.Trials.box = iup.matrix {numcol=0, numlin=#trial2key, widthdef=100}
- dung.Trials.box.dat=Trial_Dat
+ dung.Trials.box.dat = Trial_Dat
dung.Trials.box.mousemove_cb = box_mousemove_funct
--Set Line titles
@@ -1258,15 +1260,9 @@ if myaccount ~=nil then
dlg = iup.dialog{iup.vbox{
accounts[myaccount].mode,
accounts[myaccount].mode_zbox,
- iup.hbox{detail_name, -- Hover over information
- iup.fill{},
- },
- iup.hbox{detail_desc,
- iup.fill{},
- },
- iup.hbox{Status_bar, -- Bottom Status bar.
- iup.fill{},
- },
+ detail_name, -- Hover over information
+ detail_desc,
+ Status_bar, -- Bottom Status bar.
margin="5x5",
ngap="3",
},
diff --git a/data/utility.lua b/data/utility.lua
index 764fb8b..3def355 100644
--- a/data/utility.lua
+++ b/data/utility.lua
@@ -78,6 +78,10 @@ end
box_mousemove_funct = function (self, l, c)
-- we have previously added .dat to the box
+ if self.dat == nil then
+ detail_name.title = "box.dat is nil"
+ return
+ end
if l == 0 or c == 0 then
detail_name.title = ""
@@ -85,10 +89,6 @@ box_mousemove_funct = function (self, l, c)
return
end
- if self.dat == nil then
- detail_name.title = "box.dat is nil"
- return
- end
local key = self.dat.key[l]
if key == nil then