You can now toggle Full Screen in Video settings

Full screen setting is preserved after game is restarted. Switching
in and out of full screen repetitively causes some mode
inconsistencies, but this should be enough for now. You can still force
window mode with -win CLI option.

1 files changed, 36 insertions, 21 deletions

diff --git a/data/shatter/Screens/VidDlg.frm b/data/shatter/Screens/VidDlg.frm
index adf0ff5..27ccbd0 100644
--- a/data/shatter/Screens/VidDlg.frm
+++ b/data/shatter/Screens/VidDlg.frm
@@ -147,8 +147,8 @@ form: {
          x_mins:     ( 20, 100, 100,  20, 100, 100,  20)
          x_weights:  (  2,   3,   3,   2,   3,   3,   2)
 
-         y_mins:     ( 20,  25,  25,  25,  25,  25,  25,  25,  25,  20)
-         y_weights:  (  3,   0,   0,   0,   0,   0,   0,   0,   0,   7)
+         y_mins:     ( 20,  25,  25,  25,  25,  25,  25,  25,  25,  25,  20)
+         y_weights:  (  3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   7)
       }
    }
 
@@ -164,55 +164,61 @@ form: {
    },
 
    ctrl: {
-      id:               101
+      id:               102
       type:             label
-      text:             "Video Mode:"
+      text:             "Full Screen:"
       cells:            (1,1,1,1)
    },
 
    ctrl: {
+      id:               101
+      type:             label
+      text:             "Full Screen Mode:"
+      cells:            (1,2,1,1)
+   },
+
+   ctrl: {
       id:               104
       type:             label
       text:             "Max Texture Size:"
-      cells:            (1,2,1,1)
+      cells:            (1,3,1,1)
    },
 
    ctrl: {
       id:               122
       type:             label
       text:             "Shadows:"
-      cells:            (1,3,1,1)
+      cells:            (1,4,1,1)
    },
 
    ctrl: {
       id:               123
       type:             label
       text:             "Spec Maps:"
-      cells:            (1,4,1,1)
+      cells:            (1,5,1,1)
    },
 
    ctrl: {
       id:               124
       type:             label
       text:             "Bump Maps:"
-      cells:            (1,5,1,1)
+      cells:            (1,6,1,1)
    },
 
    ctrl: {
       id:               105
       type:             label
       text:             "Terrain Detail:"
-      cells:            (1,7,1,1)
+      cells:            (1,8,1,1)
    },
 
    ctrl: {
       id:               106
       type:             label
       text:             "Terrain Texture:"
-      cells:            (1,8,1,1)
+      cells:            (1,9,1,1)
    },
 
-
    ctrl: {
       id:               111
       type:             label
@@ -245,7 +251,7 @@ form: {
       id:               115
       type:             label
       text:             "Gamma Level:"
-      cells:            (4,7,1,1)
+      cells:            (4,8,1,1)
    },
 
 
@@ -264,10 +270,19 @@ form: {
 
 
    ctrl: {
-      id:               203
+      id:               202
       type:             combo
       cells:            (2,1,1,1)
 
+      item:             Disable
+      item:             Enable
+   }
+
+   ctrl: {
+      id:               203
+      type:             combo
+      cells:            (2,2,1,1)
+
       item:             "800 x 600 x 8"
       item:             "800 x 600 x 16"
       item:             "800 x 600 x 32"
@@ -276,7 +291,7 @@ form: {
    ctrl: {
       id:               204
       type:             combo
-      cells:            (2,2,1,1)
+      cells:            (2,3,1,1)
 
       item:             "64 x 64"
       item:             "128 x 128"
@@ -290,7 +305,7 @@ form: {
    ctrl: {
       id:               222
       type:             combo
-      cells:            (2,3,1,1)
+      cells:            (2,4,1,1)
 
       item:             Disable
       item:             Enable
@@ -299,7 +314,7 @@ form: {
    ctrl: {
       id:               223
       type:             combo
-      cells:            (2,4,1,1)
+      cells:            (2,5,1,1)
 
       item:             Disable
       item:             Enable
@@ -308,7 +323,7 @@ form: {
    ctrl: {
       id:               224
       type:             combo
-      cells:            (2,5,1,1)
+      cells:            (2,6,1,1)
 
       item:             Disable
       item:             Enable
@@ -317,7 +332,7 @@ form: {
    ctrl: {
       id:               205
       type:             combo
-      cells:            (2,7,1,1)
+      cells:            (2,8,1,1)
 
       item:             Low
       item:             Medium
@@ -327,7 +342,7 @@ form: {
    ctrl: {
       id:               206
       type:             combo
-      cells:            (2,8,1,1)
+      cells:            (2,9,1,1)
 
       item:             Disable
       item:             Enable
@@ -373,7 +388,7 @@ form: {
    ctrl: {
       id:               215
       type:             slider
-      cells:            (5,7,1,1)
+      cells:            (5,8,1,1)
       cell_insets:      (0,0,0,16)
 
       active_color:     (250, 250, 100)
@@ -385,7 +400,7 @@ form: {
    ctrl: {
       id:               315
       type:             label
-      cells:            (5,8,1,1)
+      cells:            (5,9,1,1)
       cell_insets:      (0,0,0,0)
 
       texture:          gamma_test