youen/GRLD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

restoring scroll positions when loading a client config

Browse Source
This commit is contained in:
Youen Toupin 2016-11-23 14:02:27 +01:00
parent 071bc6d9e1
commit fae5d84e91
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/wxLdb/wxLdbController.lua
View File

@ -427,7 +427,7 @@ end
function meta.__index:refreshScrollPosition_() function meta.__index:refreshScrollPosition_()
local config = self:getActiveClientConfig_() local config = self:getActiveClientConfig_()
for source, sp in pairs( config.scrollPositions ) do for source, sp in pairs( config.scrollPositions ) do
local page = self.window:getSourcePage( source ) local page = self.window:getSourcePage( source )
if page ~= nil then if page ~= nil then
@ -815,11 +815,26 @@ function meta.__index:loadConfig_( name )
file:close() file:close()
clientConfig.mappings = config.mappings clientConfig.mappings = config.mappings
clientConfig.breakOnConnection = config.breakOnConnection clientConfig.breakOnConnection = config.breakOnConnection
for _, file in ipairs( config.openFiles ) do
self.window:getSourcePage( file ) if config.scrollPositions ~= nil then
for source, sp in pairs( config.scrollPositions ) do
clientConfig.scrollPositions[source] = sp
end
end end
if config.breakpoints ~= nil then
for source, bp in pairs( config.breakpoints ) do for _, file in ipairs( config.openFiles ) do
local page = self.window:getSourcePage( file )
if page ~= nil then
local sp = clientConfig.scrollPositions[file]
print("scroll to", sp)
if sp ~= nil then
page:SetScrollPos(sp)
end
end
end
if clientConfig.breakpoints ~= nil then
for source, bp in pairs( clientConfig.breakpoints ) do
if clientConfig.breakpoints[source] == nil then if clientConfig.breakpoints[source] == nil then
clientConfig.breakpoints[source] = {} clientConfig.breakpoints[source] = {}
end end
@ -828,12 +843,6 @@ function meta.__index:loadConfig_( name )
end end
end end
end end
if config.scrollPositions ~= nil then
for source, sp in pairs( config.scrollPositions ) do
clientConfig.scrollPositions[source] = sp
end
end
end end
if clientConfig.breakOnConnection == nil then if clientConfig.breakOnConnection == nil then
clientConfig.breakOnConnection = true clientConfig.breakOnConnection = true