diff src/divemode.inc @ 332:0ff81ff290ce new_screen_layout

Fix positions if no VSI Bar displayed
author Janos Kovacs <kovjanos@gmail.com>
date Sun, 28 Jun 2015 03:30:03 +0200
parents 4f83470dcece
children 14b466f66a7f
line wrap: on
line diff
--- a/src/divemode.inc	Wed Jun 24 22:19:32 2015 +0200
+++ b/src/divemode.inc	Sun Jun 28 03:30:03 2015 +0200
@@ -26,12 +26,13 @@
 ;    - header: has the titles (mask)
 ;    - content: has the values
 ;******* Upper content / header row *******
-#DEFINE    dm_mask_depth_row         .0
-#DEFINE    dm_mask_depth_column      .12
-#DEFINE    dm_mask_maxdepth_row      .0
-#DEFINE    dm_mask_maxdepth_column   .73
-#DEFINE    dm_mask_divetime_row      .0
-#DEFINE    dm_mask_divetime_column   .122
+#DEFINE    dm_mask_depth_row              .0
+#DEFINE    dm_mask_depth_column           .12
+#DEFINE    dm_mask_maxdepth_row           .0
+#DEFINE    dm_mask_maxdepth_column        .73
+#DEFINE    dm_mask_maxdepth_column_nvsi   .63
+#DEFINE    dm_mask_divetime_row           .0
+#DEFINE    dm_mask_divetime_column        .122
 
 ;   The content row contains 3 columns:
 ;    - depth and ascend rate warning
@@ -61,14 +62,17 @@
 #DEFINE    dm_velobar_width        .12
 
 ;******* Upper content / content row / 2nd col *******
-#DEFINE    dm_upcnt_2ndcol            .74                       ; 74
+#DEFINE    dm_upcnt_2ndcol              .74                            ; 74
+#DEFINE    dm_upcnt_2ndcol_nvsi         .64                            ; 64
 ; Max depth
-#DEFINE    dm_max_depth_row           dm_offset                 ; 14
-#DEFINE    dm_max_depth_column        dm_upcnt_2ndcol           ; 74
-#DEFINE    dm_max_depth_bot           dm_max_depth_row+.34      ; 48
-#DEFINE    dm_max_depth_rgt           dm_max_depth_column+.36   ; 100
-#DEFINE    dm_max_depth_dm_row        dm_max_depth_row+.11      ; 25
-#DEFINE    dm_max_depth_dm_column     dm_max_depth_column+.23   ; 87
+#DEFINE    dm_max_depth_row             dm_offset                      ; 14
+#DEFINE    dm_max_depth_column          dm_upcnt_2ndcol                ; 74
+#DEFINE    dm_max_depth_column_nvsi     dm_upcnt_2ndcol_nvsi           ; 64
+#DEFINE    dm_max_depth_bot             dm_max_depth_row+.34           ; 48
+#DEFINE    dm_max_depth_rgt             dm_max_depth_column+.36        ; 100
+#DEFINE    dm_max_depth_dm_row          dm_max_depth_row+.11           ; 25
+#DEFINE    dm_max_depth_dm_column       dm_max_depth_column+.23        ; 87
+#DEFINE    dm_max_depth_dm_column_nvsi  dm_max_depth_column_nvsi+.23   ; 77
 ; Warning area (combined)
 #DEFINE    dm_warning_row             dm_offset+.36             ; 50
 #DEFINE    dm_warning_column          dm_upcnt_2ndcol           ; 74