From 922499dadaa997249d0a6775bdcfed2ac05090ce Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 31 Jul 2021 20:53:11 -0700
Subject: [PATCH] Adjusted where selectionbox is defined

---
 bin/segment2.c                  | 7 ++++++-
 src/pc/djui/djui_gfx.c          | 2 +-
 src/pc/djui/djui_selectionbox.c | 4 +---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/segment2.c b/bin/segment2.c
index 882a3725..9ad56187 100644
--- a/bin/segment2.c
+++ b/bin/segment2.c
@@ -3568,4 +3568,9 @@ const f32 font_normal_widths[] = {
     0.3750f, 0.3125f, 0.3125f, 0.3750f, 0.3125f, 0.3125f, 0.3750f, 0.3125f, 0.2500f, 0.3125f, 0.3125f, 0.1875f, 0.4375f, 0.3125f, 0.3125f, 0.3125f, 0.3750f, 0.3125f, 0.3125f, 0.3125f, 0.3125f, 0.3125f, 0.4375f, 0.4375f, 0.3125f, 0.3125f,
 /*        {        |        }        ~      DEL        */
     0.3125f, 0.2500f, 0.3125f, 0.5000f, 0.5000f
-};
\ No newline at end of file
+};
+
+
+ALIGNED8 u8 texture_selectionbox_icon[] = {
+#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c"
+};
diff --git a/src/pc/djui/djui_gfx.c b/src/pc/djui/djui_gfx.c
index b0b4df74..2bece2f0 100644
--- a/src/pc/djui/djui_gfx.c
+++ b/src/pc/djui/djui_gfx.c
@@ -29,7 +29,7 @@ f32 djui_gfx_get_scale(void) {
     wm_api->get_dimensions(&windowWidth, &windowHeight);
     if (windowHeight < 720 - 64) {
         return 0.5f;
-    } else if (windowHeight < 1440 - 64) {
+    } else if (windowHeight < 1440 + 64) {
         return 1.0f;
     } else {
         return 2.0f;
diff --git a/src/pc/djui/djui_selectionbox.c b/src/pc/djui/djui_selectionbox.c
index 3d6bb851..a33ba3a1 100644
--- a/src/pc/djui/djui_selectionbox.c
+++ b/src/pc/djui/djui_selectionbox.c
@@ -2,9 +2,7 @@
 #include <string.h>
 #include "djui.h"
 
-ALIGNED8 static u8 texture_selectionbox_icon[] = {
-#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c"
-};
+extern ALIGNED8 u8 texture_selectionbox_icon[];
 
 static void djui_selectionbox_set_default_style(struct DjuiBase* base) {
     struct DjuiSelectionbox* selectionbox = (struct DjuiSelectionbox*)base;