Make sure pitch ladder doesn't interfere with flight mode display

Signed-off-by: Octol1ttle <[email protected]>
Octol1ttle · Mar 1, 2024 · fc7c3ec · fc7c3ec
1 parent f2d93d9
commit fc7c3ec
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/indicators/PitchIndicator.java b/src/main/java/ru/octol1ttle/flightassistant/indicators/PitchIndicator.java
@@ -81,7 +81,7 @@ private void drawReferenceMark(DrawContext context, float degrees, int yHorizon,
 
         int y = MathHelper.floor((-degrees * dim.degreesPerPixel) + yHorizon);
 
-        if (y < dim.tFrame || y > dim.bFrame) {
+        if (outOfFrame(y)) {
             return;
         }
 
@@ -94,7 +94,7 @@ private void drawReferenceMark(DrawContext context, float degrees, int yHorizon,
     }
 
     private void drawDegreeBar(TextRenderer textRenderer, DrawContext context, float degree, int y) {
-        if (y < dim.tFrame || y > dim.bFrame) {
+        if (outOfFrame(y)) {
             return;
         }
 
@@ -122,7 +122,7 @@ private void drawPushArrows(TextRenderer textRenderer, DrawContext context, floa
         for (float f = degrees; f <= 90; f += 10) {
             int y = MathHelper.floor((-f * dim.degreesPerPixel) + yHorizon);
 
-            if (y < dim.tFrame || y > dim.bFrame) {
+            if (outOfFrame(y)) {
                 continue;
             }
             context.getMatrices().push();
@@ -141,13 +141,17 @@ private void drawPullArrows(TextRenderer textRenderer, DrawContext context, floa
         for (float f = degrees; f >= -90; f -= 10) {
             int y = MathHelper.floor((-f * dim.degreesPerPixel) + yHorizon);
 
-            if (y < dim.tFrame || y > dim.bFrame) {
+            if (outOfFrame(y)) {
                 continue;
             }
             drawMiddleAlignedText(textRenderer, context, text, dim.xMid, y, color);
         }
     }
 
+    private boolean outOfFrame(int y) {
+        return y < dim.tFrame || y > dim.bFrame - 20;
+    }
+
     @Override
     public void renderFaulted(DrawContext context, TextRenderer textRenderer) {
         drawMiddleAlignedText(textRenderer, context, Text.translatable("flightassistant.pitch_short"), dim.xMid, dim.yMid - 10, FAConfig.indicator().warningColor);