Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusted where selectionbox is defined

This commit is contained in:
MysterD 2021-07-31 20:53:11 -07:00
parent 8a5ee234b2
commit 8a42f21490
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/segment2.c
View File

@ -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
};
};
ALIGNED8 u8 texture_selectionbox_icon[] = {
#include "textures/segment2/custom_selectionbox_icon.rgba16.inc.c"
};

2
src/pc/djui/djui_gfx.c
View File

@ -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;

4
src/pc/djui/djui_selectionbox.c
View File

@ -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;