# HG changeset patch # User Nenue # Date 1451912168 18000 # Node ID 2bf7eb1844cbc1ad9669ff54fd6cc51c2a578a40 # Parent eb7544afd77ae796188b8fae2a695829b2467277 commenting out prints diff -r eb7544afd77a -r 2bf7eb1844cb Devian.xml --- a/Devian.xml Mon Jan 04 05:42:44 2016 -0500 +++ b/Devian.xml Mon Jan 04 07:56:08 2016 -0500 @@ -232,12 +232,6 @@ Devian.DockHighlight(self) - - print('click', button, 'down') - - - print('click', button, 'up') - @@ -277,13 +271,16 @@ if IsShiftKeyDown() then Devian:Console_Toggle(self.console.index, 0) else - Devian:Console_Toggle(self.console.index) - if self.console.enabled then - if self.console.minimized then - self.console:MinMax() + if self.console.index == DevianDB.current_channel or (not self.console.enabled) then + Devian:Console_Toggle(self.console.index) + if self.console.enabled then + if self.console.minimized then + self.console:MinMax() + end + self.console:ToFront() end + else self.console:ToFront() - else end end elseif button == "RightButton" then diff -r eb7544afd77a -r 2bf7eb1844cb Dock.lua --- a/Dock.lua Mon Jan 04 05:42:44 2016 -0500 +++ b/Dock.lua Mon Jan 04 07:56:08 2016 -0500 @@ -43,7 +43,7 @@ local target = D.console[select(1,...)] if target.dockedTo then local t = D.c[target.dockedTo] - print('channel',target.index,target.signature, 'is docked to',t.index, t.signature..'. using that instead') + --print('channel',target.index,target.signature, 'is docked to',t.index, t.signature..'. using that instead') target = D.console[target.DockedTo] end @@ -124,7 +124,7 @@ --- Dock interactions function D.DockHighlight(beacon) db = D.db - print('Dvn', 'dock mouse event', beacon) + --print('Dvn', 'dock mouse event', beacon) local self = D.dock local mouseOverDock --for i, b in pairs(self.buttons) do @@ -143,7 +143,7 @@ local a = (db.dock_button_alpha_on - self:GetAlpha()) local b = (db.dock_button_alpha_on-db.dock_button_alpha_off) local dur = (a / b) * db.dock_button_fade_in - print(a, b, db.dock_button_fade_in, dur) + --print(a, b, db.dock_button_fade_in, dur) UIFrameFadeIn(beacon, dur,beacon:GetAlpha(),db.dock_button_alpha_on) UIFrameFadeIn(beacon.caption, dur,beacon:GetAlpha(),1) end @@ -152,7 +152,7 @@ local a = (self:GetAlpha() - db.dock_button_alpha_off) local b = (db.dock_button_alpha_on-db.dock_button_alpha_off) local dur = (a / b) * db.dock_button_fade_out - print(a, b, db.dock_button_fade_in, dur) + --print(a, b, db.dock_button_fade_in, dur) UIFrameFadeOut(beacon, dur,beacon:GetAlpha(),db.dock_button_alpha_off) UIFrameFadeOut(beacon.caption, dur,beacon:GetAlpha(),0) end @@ -161,21 +161,21 @@ --end if mouseOverDock then if not self.raised then - print('rising') + --print('rising') self.raised = true local a = (db.dock_alpha_on - self:GetAlpha()) local b = (db.dock_alpha_on-db.dock_alpha_off) local dur = (a / b) * db.dock_fade_in - print(a, b, db.dock_fade_in, dur) + --print(a, b, db.dock_fade_in, dur) UIFrameFadeIn(self, dur,self:GetAlpha(),db.dock_alpha_on) end elseif self.raised then - print('dropping') + --print('dropping') self.raised = nil local a = (self:GetAlpha() - db.dock_alpha_off) local b = (db.dock_alpha_on-db.dock_alpha_off) local dur = (a / b) * db.dock_fade_out - print(a, b, db.dock_fade_in, dur) + --print(a, b, db.dock_fade_in, dur) UIFrameFadeOut(self, dur,self:GetAlpha(),db.dock_alpha_off) end