From c3a0bd4def2243b66cacf27222b62d9441ebbaff Mon Sep 17 00:00:00 2001
From: Robert <robert.styla@gmail.com>
Date: Fri, 27 Dec 2019 23:03:31 +0100
Subject: [PATCH] Remove DFULL_SCREEN (#5695)

---
 .luacheckrc                      |  1 -
 defaults.lua                     |  3 ++-
 frontend/ui/data/koptoptions.lua |  2 +-
 spec/unit/defaults_spec.lua      | 24 +++++++++++-------------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.luacheckrc b/.luacheckrc
index 4f636d6ce..1ef3c1df4 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -13,7 +13,6 @@ read_globals = {
     "KOBO_TOUCH_MIRRORED",
     "KOBO_SYNC_BRIGHTNESS_WITH_NICKEL",
     "DHINTCOUNT",
-    "DFULL_SCREEN",
     "DSCROLL_MODE",
     "DGLOBALGAMMA",
     "DRENDER_MODE",
diff --git a/defaults.lua b/defaults.lua
index 395ff7c44..b096e1543 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -11,7 +11,8 @@
 DHINTCOUNT = 1
 
 -- full screen mode, 1 for true, 0 for false
-DFULL_SCREEN = 1
+-- no longer needed
+--DFULL_SCREEN = 1
 
 -- scroll mode, 1 for true, 0 for false
 DSCROLL_MODE = 1
diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua
index 1e8d93fc4..6c0f811fa 100644
--- a/frontend/ui/data/koptoptions.lua
+++ b/frontend/ui/data/koptoptions.lua
@@ -59,7 +59,7 @@ local KoptOptions = {
                 name_text = S.PROGRESS_BAR,
                 toggle = {S.OFF, S.ON},
                 values = {1, 0},
-                default_value = DFULL_SCREEN,
+                default_value = 1,
                 event = "SetFullScreen",
                 args = {true, false},
                 show = false,
diff --git a/spec/unit/defaults_spec.lua b/spec/unit/defaults_spec.lua
index bc5f66b5f..3a9802029 100644
--- a/spec/unit/defaults_spec.lua
+++ b/spec/unit/defaults_spec.lua
@@ -8,8 +8,7 @@ describe("defaults module", function()
 
     it("should load all defaults from defaults.lua", function()
         Defaults:init()
-        assert.is_same(108, #Defaults.defaults_name)
-        assert.is_same("DFULL_SCREEN", Defaults.defaults_name[54])
+        assert.is_same(107, #Defaults.defaults_name)
     end)
 
     it("should save changes to defaults.persistent.lua", function()
@@ -20,13 +19,12 @@ describe("defaults module", function()
         Defaults.changed[20] = true
         Defaults.changed[47] = true
         Defaults.changed[54] = true
-        Defaults.changed[87] = true
-        Defaults.changed[103] = true
+        Defaults.changed[86] = true
+        Defaults.changed[102] = true
         Defaults:saveSettings()
-        assert.is_same(108, #Defaults.defaults_name)
-        assert.is_same("DFULL_SCREEN", Defaults.defaults_name[54])
-        assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[103])
-        assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[87])
+        assert.is_same(107, #Defaults.defaults_name)
+        assert.is_same("SEARCH_LIBRARY_PATH", Defaults.defaults_name[102])
+        assert.is_same("DTAP_ZONE_BACKWARD", Defaults.defaults_name[86])
         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")
@@ -47,7 +45,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE = {
     [1] = 50,
     [2] = 50
 }
-DFULL_SCREEN = 1
+DGLOBALGAMMA = 1
 ]],
                        fd:read("*a"))
         fd:close()
@@ -56,8 +54,8 @@ DFULL_SCREEN = 1
         Defaults:init()
         Defaults.changed[54] = true
         Defaults.defaults_value[54] = 2
-        Defaults.changed[87] = true
-        Defaults.defaults_value[87] = {
+        Defaults.changed[86] = true
+        Defaults.defaults_value[86] = {
             y = 10,
             x = 10.125,
             h = 20.25,
@@ -82,7 +80,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_XXX_LARGE = {
     [2] = 50,
     [1] = 50
 }
-DFULL_SCREEN = 2
+DGLOBALGAMMA = 2
 ]],
                        fd:read("*a"))
         fd:close()
@@ -118,7 +116,7 @@ DCREREADER_CONFIG_H_MARGIN_SIZES_LARGE = {
     [1] = 15
 }
 DHINTCOUNT = 2
-DFULL_SCREEN = 1
+DGLOBALGAMMA = 1
 DCREREADER_VIEW_MODE = "page"
 ]],
                        fd:read("*a"))