Remove DSCROLL_MODE and DGLOBALGAMMA (#5754)

This commit is contained in:
Robert
2020-01-07 20:16:59 +01:00
committed by poire-z
parent d9b37a1794
commit 73a0f2f9d1
5 changed files with 35 additions and 20 deletions

View File

@@ -8,7 +8,7 @@ describe("defaults module", function()
it("should load all defaults from defaults.lua", function()
Defaults:init()
assert.is_same(105, #Defaults.defaults_name)
assert.is_same(103, #Defaults.defaults_name)
end)
it("should save changes to defaults.persistent.lua", function()
@@ -18,13 +18,13 @@ describe("defaults module", function()
-- not in persistent but checked in defaults
Defaults.changed[20] = true
Defaults.changed[47] = true
Defaults.changed[54] = true
Defaults.changed[84] = true
Defaults.changed[100] = true
Defaults.changed[53] = true
Defaults.changed[82] = true
Defaults.changed[98] = true --SEARCH_LIBRARY_PATH = ""
Defaults:saveSettings()
assert.is_same(105, #Defaults.defaults_name)
assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[100])
assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[84])
assert.is_same(103, #Defaults.defaults_name)
assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[98])
assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[82])
assert.is_same("DCREREADER_CONFIG_WORD_SPACING_LARGE", Defaults.defaults_name[47])
assert.is_same("DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE", Defaults.defaults_name[20])
local fd = io.open(persistent_filename, "r")
@@ -45,17 +45,27 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE = {
[1] = 50,
[2] = 50
}
DGLOBALGAMMA = 1
DDOUBLE_TAP_ZONE_PREV_CHAPTER = {
["y"] = 0,
["x"] = 0,
["h"] = 0.25,
["w"] = 0.25
}
]],
fd:read("*a"))
fd:close()
-- in persistent
Defaults:init()
Defaults.changed[54] = true
Defaults.defaults_value[54] = 2
Defaults.changed[84] = true
Defaults.defaults_value[84] = {
Defaults.changed[53] = true
Defaults.defaults_value[53] = {
y = 0,
x = 0,
h = 0.25,
w = 0.75
}
Defaults.changed[82] = true
Defaults.defaults_value[82] = {
y = 10,
x = 10.125,
h = 20.25,
@@ -80,7 +90,12 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE = {
[2] = 50,
[1] = 50
}
DGLOBALGAMMA = 2
DDOUBLE_TAP_ZONE_PREV_CHAPTER = {
["y"] = 0,
["x"] = 0,
["h"] = 0.25,
["w"] = 0.75
}
]],
fd:read("*a"))
fd:close()
@@ -116,7 +131,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE = {
[1] = 15
}
DHINTCOUNT = 2
DGLOBALGAMMA = 1
DGLOBAL_CACHE_FREE_PROPORTION = 1
DCREREADER_VIEW_MODE = "page"
]],
fd:read("*a"))