Merge pull request #150 from laamaa/bugfix/waveform_size

#149 fix waveform height, optimize font files, move oscilloscope height definition to font files
laamaa · May 26, 2024 · 3c319a9 · 3c319a9
2 parents 9b8c76e + 708a49d
commit 3c319a9
Show file tree

Hide file tree

Showing 7 changed files with 397 additions and 23 deletions.
diff --git a/src/font1.h b/src/font1.h
diff --git a/src/font2.h b/src/font2.h
diff --git a/src/font3.h b/src/font3.h
diff --git a/src/font4.h b/src/font4.h
diff --git a/src/font5.h b/src/font5.h
diff --git a/src/inline_font.h b/src/inline_font.h
@@ -9,6 +9,7 @@ struct inline_font {
     const int screen_offset_x;
     const int screen_offset_y;
     const int text_offset_y;
+    const int waveform_max_height;
     const long image_size;
     const unsigned char image_data[];
 };

diff --git a/src/render.c b/src/render.c
@@ -29,7 +29,7 @@ static int font_mode = -1;
 static int m8_hardware_model = 0;
 static int screen_offset_y = 0;
 static int text_offset_y = 0;
-static int waveform_max_height = 20;
+static int waveform_max_height = 24;
 
 static int texture_width = 320;
 static int texture_height = 240;
@@ -143,15 +143,7 @@ void set_font_mode(unsigned int mode) {
   font_mode = mode;
   screen_offset_y = fonts[mode]->screen_offset_y;
   text_offset_y = fonts[mode]->text_offset_y;
-
-  if (m8_hardware_model == 0) {
-    waveform_max_height = 20;
-  } else {
-    waveform_max_height = 38;
-    if(font_mode == 4) {
-      waveform_max_height = 20;
-    }
-  }
+  waveform_max_height = fonts[mode]->waveform_max_height;
 
   change_font(fonts[mode]);
   SDL_LogDebug(SDL_LOG_CATEGORY_RENDER,"Font mode %i, Screen offset %i", mode, screen_offset_y);